diff options
Diffstat (limited to 'drivers/media/pci/cx23885/cimax2.c')
-rw-r--r-- | drivers/media/pci/cx23885/cimax2.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c index 6617774a326a..7344849183a7 100644 --- a/drivers/media/pci/cx23885/cimax2.c +++ b/drivers/media/pci/cx23885/cimax2.c | |||
@@ -24,6 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "cx23885.h" | 26 | #include "cx23885.h" |
27 | #include "cimax2.h" | ||
27 | #include "dvb_ca_en50221.h" | 28 | #include "dvb_ca_en50221.h" |
28 | /**** Bit definitions for MC417_RWD and MC417_OEN registers *** | 29 | /**** Bit definitions for MC417_RWD and MC417_OEN registers *** |
29 | bits 31-16 | 30 | bits 31-16 |
@@ -87,7 +88,7 @@ struct netup_ci_state { | |||
87 | }; | 88 | }; |
88 | 89 | ||
89 | 90 | ||
90 | int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, | 91 | static int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, |
91 | u8 *buf, int len) | 92 | u8 *buf, int len) |
92 | { | 93 | { |
93 | int ret; | 94 | int ret; |
@@ -120,7 +121,7 @@ int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, | |||
120 | return 0; | 121 | return 0; |
121 | } | 122 | } |
122 | 123 | ||
123 | int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, | 124 | static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, |
124 | u8 *buf, int len) | 125 | u8 *buf, int len) |
125 | { | 126 | { |
126 | int ret; | 127 | int ret; |
@@ -147,7 +148,7 @@ int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, | |||
147 | return 0; | 148 | return 0; |
148 | } | 149 | } |
149 | 150 | ||
150 | int netup_ci_get_mem(struct cx23885_dev *dev) | 151 | static int netup_ci_get_mem(struct cx23885_dev *dev) |
151 | { | 152 | { |
152 | int mem; | 153 | int mem; |
153 | unsigned long timeout = jiffies + msecs_to_jiffies(1); | 154 | unsigned long timeout = jiffies + msecs_to_jiffies(1); |
@@ -166,7 +167,7 @@ int netup_ci_get_mem(struct cx23885_dev *dev) | |||
166 | return mem & 0xff; | 167 | return mem & 0xff; |
167 | } | 168 | } |
168 | 169 | ||
169 | int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, | 170 | static int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, |
170 | u8 flag, u8 read, int addr, u8 data) | 171 | u8 flag, u8 read, int addr, u8 data) |
171 | { | 172 | { |
172 | struct netup_ci_state *state = en50221->data; | 173 | struct netup_ci_state *state = en50221->data; |
@@ -248,7 +249,8 @@ int netup_ci_write_attribute_mem(struct dvb_ca_en50221 *en50221, | |||
248 | return netup_ci_op_cam(en50221, slot, 0, 0, addr, data); | 249 | return netup_ci_op_cam(en50221, slot, 0, 0, addr, data); |
249 | } | 250 | } |
250 | 251 | ||
251 | int netup_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr) | 252 | int netup_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, |
253 | u8 addr) | ||
252 | { | 254 | { |
253 | return netup_ci_op_cam(en50221, slot, NETUP_CI_CTL, | 255 | return netup_ci_op_cam(en50221, slot, NETUP_CI_CTL, |
254 | NETUP_CI_RD, addr, 0); | 256 | NETUP_CI_RD, addr, 0); |
@@ -295,7 +297,7 @@ int netup_ci_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot) | |||
295 | return 0; | 297 | return 0; |
296 | } | 298 | } |
297 | 299 | ||
298 | int netup_ci_set_irq(struct dvb_ca_en50221 *en50221, u8 irq_mode) | 300 | static int netup_ci_set_irq(struct dvb_ca_en50221 *en50221, u8 irq_mode) |
299 | { | 301 | { |
300 | struct netup_ci_state *state = en50221->data; | 302 | struct netup_ci_state *state = en50221->data; |
301 | int ret; | 303 | int ret; |
@@ -399,7 +401,8 @@ int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status) | |||
399 | return 1; | 401 | return 1; |
400 | } | 402 | } |
401 | 403 | ||
402 | int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, int slot, int open) | 404 | int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, |
405 | int slot, int open) | ||
403 | { | 406 | { |
404 | struct netup_ci_state *state = en50221->data; | 407 | struct netup_ci_state *state = en50221->data; |
405 | 408 | ||