diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/mxl111sf.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/mxl111sf.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.c b/drivers/media/dvb/dvb-usb/mxl111sf.c index 825a8b242e09..38ef0253d3b5 100644 --- a/drivers/media/dvb/dvb-usb/mxl111sf.c +++ b/drivers/media/dvb/dvb-usb/mxl111sf.c | |||
@@ -758,6 +758,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table); | |||
758 | 758 | ||
759 | 759 | ||
760 | #define MXL111SF_EP4_BULK_STREAMING_CONFIG \ | 760 | #define MXL111SF_EP4_BULK_STREAMING_CONFIG \ |
761 | .size_of_priv = sizeof(struct mxl111sf_adap_state), \ | ||
761 | .streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \ | 762 | .streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \ |
762 | .stream = { \ | 763 | .stream = { \ |
763 | .type = USB_BULK, \ | 764 | .type = USB_BULK, \ |
@@ -772,6 +773,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table); | |||
772 | 773 | ||
773 | /* FIXME: works for v6 but not v8 silicon */ | 774 | /* FIXME: works for v6 but not v8 silicon */ |
774 | #define MXL111SF_EP4_ISOC_STREAMING_CONFIG \ | 775 | #define MXL111SF_EP4_ISOC_STREAMING_CONFIG \ |
776 | .size_of_priv = sizeof(struct mxl111sf_adap_state), \ | ||
775 | .streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \ | 777 | .streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \ |
776 | .stream = { \ | 778 | .stream = { \ |
777 | .type = USB_ISOC, \ | 779 | .type = USB_ISOC, \ |
@@ -788,6 +790,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table); | |||
788 | } | 790 | } |
789 | 791 | ||
790 | #define MXL111SF_EP6_BULK_STREAMING_CONFIG \ | 792 | #define MXL111SF_EP6_BULK_STREAMING_CONFIG \ |
793 | .size_of_priv = sizeof(struct mxl111sf_adap_state), \ | ||
791 | .streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \ | 794 | .streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \ |
792 | .stream = { \ | 795 | .stream = { \ |
793 | .type = USB_BULK, \ | 796 | .type = USB_BULK, \ |
@@ -802,6 +805,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table); | |||
802 | 805 | ||
803 | /* FIXME */ | 806 | /* FIXME */ |
804 | #define MXL111SF_EP6_ISOC_STREAMING_CONFIG \ | 807 | #define MXL111SF_EP6_ISOC_STREAMING_CONFIG \ |
808 | .size_of_priv = sizeof(struct mxl111sf_adap_state), \ | ||
805 | .streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \ | 809 | .streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \ |
806 | .stream = { \ | 810 | .stream = { \ |
807 | .type = USB_ISOC, \ | 811 | .type = USB_ISOC, \ |
@@ -839,8 +843,6 @@ static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties = { | |||
839 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, | 843 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, |
840 | .num_frontends = 1, | 844 | .num_frontends = 1, |
841 | .fe = {{ | 845 | .fe = {{ |
842 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
843 | |||
844 | .frontend_attach = mxl111sf_attach_demod, | 846 | .frontend_attach = mxl111sf_attach_demod, |
845 | .tuner_attach = mxl111sf_attach_tuner, | 847 | .tuner_attach = mxl111sf_attach_tuner, |
846 | 848 | ||
@@ -883,8 +885,6 @@ static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties = { | |||
883 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, | 885 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, |
884 | .num_frontends = 1, | 886 | .num_frontends = 1, |
885 | .fe = {{ | 887 | .fe = {{ |
886 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
887 | |||
888 | .frontend_attach = mxl111sf_attach_demod, | 888 | .frontend_attach = mxl111sf_attach_demod, |
889 | .tuner_attach = mxl111sf_attach_tuner, | 889 | .tuner_attach = mxl111sf_attach_tuner, |
890 | 890 | ||
@@ -927,16 +927,12 @@ static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = { | |||
927 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, | 927 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, |
928 | .num_frontends = 2, | 928 | .num_frontends = 2, |
929 | .fe = {{ | 929 | .fe = {{ |
930 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
931 | |||
932 | .frontend_attach = mxl111sf_lgdt3305_frontend_attach, | 930 | .frontend_attach = mxl111sf_lgdt3305_frontend_attach, |
933 | .tuner_attach = mxl111sf_attach_tuner, | 931 | .tuner_attach = mxl111sf_attach_tuner, |
934 | 932 | ||
935 | MXL111SF_EP6_BULK_STREAMING_CONFIG, | 933 | MXL111SF_EP6_BULK_STREAMING_CONFIG, |
936 | }, | 934 | }, |
937 | { | 935 | { |
938 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
939 | |||
940 | .frontend_attach = mxl111sf_attach_demod, | 936 | .frontend_attach = mxl111sf_attach_demod, |
941 | .tuner_attach = mxl111sf_attach_tuner, | 937 | .tuner_attach = mxl111sf_attach_tuner, |
942 | 938 | ||
@@ -992,16 +988,12 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = { | |||
992 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, | 988 | .fe_ioctl_override = mxl111sf_fe_ioctl_override, |
993 | .num_frontends = 2, | 989 | .num_frontends = 2, |
994 | .fe = {{ | 990 | .fe = {{ |
995 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
996 | |||
997 | .frontend_attach = mxl111sf_lgdt3305_frontend_attach, | 991 | .frontend_attach = mxl111sf_lgdt3305_frontend_attach, |
998 | .tuner_attach = mxl111sf_attach_tuner, | 992 | .tuner_attach = mxl111sf_attach_tuner, |
999 | 993 | ||
1000 | MXL111SF_EP6_ISOC_STREAMING_CONFIG, | 994 | MXL111SF_EP6_ISOC_STREAMING_CONFIG, |
1001 | }, | 995 | }, |
1002 | { | 996 | { |
1003 | .size_of_priv = sizeof(struct mxl111sf_adap_state), | ||
1004 | |||
1005 | .frontend_attach = mxl111sf_attach_demod, | 997 | .frontend_attach = mxl111sf_attach_demod, |
1006 | .tuner_attach = mxl111sf_attach_tuner, | 998 | .tuner_attach = mxl111sf_attach_tuner, |
1007 | 999 | ||