diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9005.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9005.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c index cfe71feefcad..ca5a0a4d2a47 100644 --- a/drivers/media/dvb/dvb-usb/af9005.c +++ b/drivers/media/dvb/dvb-usb/af9005.c | |||
@@ -35,17 +35,17 @@ module_param_named(led, dvb_usb_af9005_led, bool, 0644); | |||
35 | MODULE_PARM_DESC(led, "enable led (default: 1)."); | 35 | MODULE_PARM_DESC(led, "enable led (default: 1)."); |
36 | 36 | ||
37 | /* eeprom dump */ | 37 | /* eeprom dump */ |
38 | int dvb_usb_af9005_dump_eeprom = 0; | 38 | static int dvb_usb_af9005_dump_eeprom; |
39 | module_param_named(dump_eeprom, dvb_usb_af9005_dump_eeprom, int, 0); | 39 | module_param_named(dump_eeprom, dvb_usb_af9005_dump_eeprom, int, 0); |
40 | MODULE_PARM_DESC(dump_eeprom, "dump contents of the eeprom."); | 40 | MODULE_PARM_DESC(dump_eeprom, "dump contents of the eeprom."); |
41 | 41 | ||
42 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | 42 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
43 | 43 | ||
44 | /* remote control decoder */ | 44 | /* remote control decoder */ |
45 | int (*rc_decode) (struct dvb_usb_device * d, u8 * data, int len, u32 * event, | 45 | static int (*rc_decode) (struct dvb_usb_device *d, u8 *data, int len, |
46 | int *state); | 46 | u32 *event, int *state); |
47 | void *rc_keys; | 47 | static void *rc_keys; |
48 | int *rc_keys_size; | 48 | static int *rc_keys_size; |
49 | 49 | ||
50 | u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; | 50 | u8 regmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; |
51 | 51 | ||
@@ -54,8 +54,8 @@ struct af9005_device_state { | |||
54 | int led_state; | 54 | int led_state; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen, | 57 | static int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, |
58 | u8 * rbuf, u16 rlen, int delay_ms) | 58 | u8 *rbuf, u16 rlen, int delay_ms) |
59 | { | 59 | { |
60 | int actlen, ret = -ENOMEM; | 60 | int actlen, ret = -ENOMEM; |
61 | 61 | ||
@@ -98,12 +98,7 @@ int af9005_usb_generic_rw(struct dvb_usb_device *d, u8 * wbuf, u16 wlen, | |||
98 | return ret; | 98 | return ret; |
99 | } | 99 | } |
100 | 100 | ||
101 | int af9005_usb_generic_write(struct dvb_usb_device *d, u8 * buf, u16 len) | 101 | static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg, |
102 | { | ||
103 | return af9005_usb_generic_rw(d, buf, len, NULL, 0, 0); | ||
104 | } | ||
105 | |||
106 | int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg, | ||
107 | int readwrite, int type, u8 * values, int len) | 102 | int readwrite, int type, u8 * values, int len) |
108 | { | 103 | { |
109 | struct af9005_device_state *st = d->priv; | 104 | struct af9005_device_state *st = d->priv; |
@@ -765,7 +760,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 * reply) | |||
765 | return 0; | 760 | return 0; |
766 | } | 761 | } |
767 | 762 | ||
768 | int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw) | 763 | static int af9005_download_firmware(struct usb_device *udev, const struct firmware *fw) |
769 | { | 764 | { |
770 | int i, packets, ret, act_len; | 765 | int i, packets, ret, act_len; |
771 | 766 | ||