Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: media/pci/ngene/ngene.h: remove #ifdef NGENE_V4L

Remove the dead code under NGENE_V4L.

Among others, this removes references to the old videobuf framework
that isn't actually used by this driver.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
b02c4a52 2a0c2806

-78
-78
drivers/media/pci/ngene/ngene.h
··· 596 596 int capture_source[MIXER_ADDR_LAST + 1][2]; 597 597 }; 598 598 599 - #ifdef NGENE_V4L 600 - struct ngene_overlay { 601 - int tvnorm; 602 - struct v4l2_rect w; 603 - enum v4l2_field field; 604 - struct v4l2_clip *clips; 605 - int nclips; 606 - int setup_ok; 607 - }; 608 - 609 - struct ngene_tvnorm { 610 - int v4l2_id; 611 - char *name; 612 - u16 swidth, sheight; /* scaled standard width, height */ 613 - int tuner_norm; 614 - int soundstd; 615 - }; 616 - 617 - struct ngene_vopen { 618 - struct ngene_channel *ch; 619 - enum v4l2_priority prio; 620 - int width; 621 - int height; 622 - int depth; 623 - struct videobuf_queue vbuf_q; 624 - struct videobuf_queue vbi; 625 - int fourcc; 626 - int picxcount; 627 - int resources; 628 - enum v4l2_buf_type type; 629 - const struct ngene_format *fmt; 630 - 631 - const struct ngene_format *ovfmt; 632 - struct ngene_overlay ov; 633 - }; 634 - #endif 635 - 636 599 struct ngene_channel { 637 600 struct device device; 638 601 struct i2c_adapter i2c_adapter; ··· 671 708 struct ngene_tvnorm *tvnorms; 672 709 int tvnorm_num; 673 710 int tvnorm; 674 - 675 - #ifdef NGENE_V4L 676 - int videousers; 677 - struct v4l2_prio_state prio; 678 - struct ngene_vopen init; 679 - int resources; 680 - struct v4l2_framebuffer fbuf; 681 - struct ngene_buffer *screen; /* overlay */ 682 - struct list_head capture; /* video capture queue */ 683 - spinlock_t s_lock; 684 - struct semaphore reslock; 685 - #endif 686 711 687 712 int running; 688 713 ··· 813 862 int (*gate_ctrl)(struct dvb_frontend *, int); 814 863 int (*switch_ctrl)(struct ngene_channel *, int, int); 815 864 }; 816 - 817 - #ifdef NGENE_V4L 818 - struct ngene_format { 819 - char *name; 820 - int fourcc; /* video4linux 2 */ 821 - int btformat; /* BT848_COLOR_FMT_* */ 822 - int format; 823 - int btswap; /* BT848_COLOR_CTL_* */ 824 - int depth; /* bit/pixel */ 825 - int flags; 826 - int hshift, vshift; /* for planar modes */ 827 - int palette; 828 - }; 829 - 830 - #define RESOURCE_OVERLAY 1 831 - #define RESOURCE_VIDEO 2 832 - #define RESOURCE_VBI 4 833 - 834 - struct ngene_buffer { 835 - /* common v4l buffer stuff -- must be first */ 836 - struct videobuf_buffer vb; 837 - 838 - /* ngene specific */ 839 - const struct ngene_format *fmt; 840 - int tvnorm; 841 - int btformat; 842 - int btswap; 843 - }; 844 - #endif 845 865 846 866 847 867 /* Provided by ngene-core.c */