diff options
-rw-r--r-- | drivers/media/pci/mantis/mantis_input.c | 5 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_uart.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/mantis/mantis_vp1033.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/pci/mantis/mantis_input.c b/drivers/media/pci/mantis/mantis_input.c index db6d54d3fec0..0e5252e5c0ef 100644 --- a/drivers/media/pci/mantis/mantis_input.c +++ b/drivers/media/pci/mantis/mantis_input.c | |||
@@ -18,6 +18,8 @@ | |||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #if 0 /* Currently unused */ | ||
22 | |||
21 | #include <media/rc-core.h> | 23 | #include <media/rc-core.h> |
22 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
23 | 25 | ||
@@ -150,10 +152,11 @@ out: | |||
150 | return err; | 152 | return err; |
151 | } | 153 | } |
152 | 154 | ||
153 | int mantis_exit(struct mantis_pci *mantis) | 155 | int mantis_init_exit(struct mantis_pci *mantis) |
154 | { | 156 | { |
155 | rc_unregister_device(mantis->rc); | 157 | rc_unregister_device(mantis->rc); |
156 | rc_map_unregister(&ir_mantis_map); | 158 | rc_map_unregister(&ir_mantis_map); |
157 | return 0; | 159 | return 0; |
158 | } | 160 | } |
159 | 161 | ||
162 | #endif | ||
diff --git a/drivers/media/pci/mantis/mantis_uart.c b/drivers/media/pci/mantis/mantis_uart.c index 85e977861b4a..a70719218631 100644 --- a/drivers/media/pci/mantis/mantis_uart.c +++ b/drivers/media/pci/mantis/mantis_uart.c | |||
@@ -61,7 +61,7 @@ static struct { | |||
61 | 61 | ||
62 | #define UART_MAX_BUF 16 | 62 | #define UART_MAX_BUF 16 |
63 | 63 | ||
64 | int mantis_uart_read(struct mantis_pci *mantis, u8 *data) | 64 | static int mantis_uart_read(struct mantis_pci *mantis, u8 *data) |
65 | { | 65 | { |
66 | struct mantis_hwconfig *config = mantis->hwconfig; | 66 | struct mantis_hwconfig *config = mantis->hwconfig; |
67 | u32 stat = 0, i; | 67 | u32 stat = 0, i; |
diff --git a/drivers/media/pci/mantis/mantis_vp1033.c b/drivers/media/pci/mantis/mantis_vp1033.c index ad013e93ed11..115003e8d19d 100644 --- a/drivers/media/pci/mantis/mantis_vp1033.c +++ b/drivers/media/pci/mantis/mantis_vp1033.c | |||
@@ -83,7 +83,7 @@ u8 lgtdqcs001f_inittab[] = { | |||
83 | #define MANTIS_MODEL_NAME "VP-1033" | 83 | #define MANTIS_MODEL_NAME "VP-1033" |
84 | #define MANTIS_DEV_TYPE "DVB-S/DSS" | 84 | #define MANTIS_DEV_TYPE "DVB-S/DSS" |
85 | 85 | ||
86 | int lgtdqcs001f_tuner_set(struct dvb_frontend *fe) | 86 | static int lgtdqcs001f_tuner_set(struct dvb_frontend *fe) |
87 | { | 87 | { |
88 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 88 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
89 | struct mantis_pci *mantis = fe->dvb->priv; | 89 | struct mantis_pci *mantis = fe->dvb->priv; |
@@ -115,8 +115,8 @@ int lgtdqcs001f_tuner_set(struct dvb_frontend *fe) | |||
115 | return 0; | 115 | return 0; |
116 | } | 116 | } |
117 | 117 | ||
118 | int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe, | 118 | static int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe, |
119 | u32 srate, u32 ratio) | 119 | u32 srate, u32 ratio) |
120 | { | 120 | { |
121 | u8 aclk = 0; | 121 | u8 aclk = 0; |
122 | u8 bclk = 0; | 122 | u8 bclk = 0; |