aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx23885
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-10-27 10:29:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-27 15:58:25 -0400
commitada73eee1246768d5ec6f1e3b8882a5dd0456266 (patch)
tree086d32d6db92bb4905361a10dec9eda0ba5c1ade /drivers/media/pci/cx23885
parent5e6e81b2890db3969527772a8350825a85c22d5c (diff)
[media] cx23885: get rid of warning: no previous prototype
drivers/media/pci/cx23885/altera-ci.c:266:5: warning: no previous prototype for 'altera_ci_op_cam' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:301:5: warning: no previous prototype for 'altera_ci_read_attribute_mem' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:307:5: warning: no previous prototype for 'altera_ci_write_attribute_mem' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:313:5: warning: no previous prototype for 'altera_ci_read_cam_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:319:5: warning: no previous prototype for 'altera_ci_write_cam_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:325:5: warning: no previous prototype for 'altera_ci_slot_reset' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:368:5: warning: no previous prototype for 'altera_ci_slot_shutdown' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:374:5: warning: no previous prototype for 'altera_ci_slot_ts_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:451:5: warning: no previous prototype for 'altera_poll_ci_slot_status' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:462:6: warning: no previous prototype for 'altera_hw_filt_release' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:584:5: warning: no previous prototype for 'altera_pid_feed_control' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:606:5: warning: no previous prototype for 'altera_ci_start_feed' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:613:5: warning: no previous prototype for 'altera_ci_stop_feed' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:620:5: warning: no previous prototype for 'altera_ci_start_feed_1' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:625:5: warning: no previous prototype for 'altera_ci_stop_feed_1' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:630:5: warning: no previous prototype for 'altera_ci_start_feed_2' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:635:5: warning: no previous prototype for 'altera_ci_stop_feed_2' [-Wmissing-prototypes] drivers/media/pci/cx23885/altera-ci.c:640:5: warning: no previous prototype for 'altera_hw_filt_init' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:123:5: warning: no previous prototype for 'netup_write_i2c' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:150:5: warning: no previous prototype for 'netup_ci_get_mem' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:169:5: warning: no previous prototype for 'netup_ci_op_cam' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:239:5: warning: no previous prototype for 'netup_ci_read_attribute_mem' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:245:5: warning: no previous prototype for 'netup_ci_write_attribute_mem' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:251:5: warning: no previous prototype for 'netup_ci_read_cam_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:257:5: warning: no previous prototype for 'netup_ci_write_cam_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:263:5: warning: no previous prototype for 'netup_ci_slot_reset' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:292:5: warning: no previous prototype for 'netup_ci_slot_shutdown' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:298:5: warning: no previous prototype for 'netup_ci_set_irq' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:319:5: warning: no previous prototype for 'netup_ci_slot_ts_ctl' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:375:5: warning: no previous prototype for 'netup_ci_slot_status' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:402:5: warning: no previous prototype for 'netup_poll_ci_slot_status' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:415:5: warning: no previous prototype for 'netup_ci_init' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:520:6: warning: no previous prototype for 'netup_ci_exit' [-Wmissing-prototypes] drivers/media/pci/cx23885/cimax2.c:90:5: warning: no previous prototype for 'netup_read_i2c' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-av.c:26:6: warning: no previous prototype for 'cx23885_av_work_handler' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-cards.c:1430:5: warning: no previous prototype for 'netup_jtag_io' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-core.c:306:6: warning: no previous prototype for 'cx23885_irq_add' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-dvb.c:662:5: warning: no previous prototype for 'netup_altera_fpga_rw' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-f300.c:150:5: warning: no previous prototype for 'f300_set_voltage' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-input.c:249:5: warning: no previous prototype for 'cx23885_input_init' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-input.c:353:6: warning: no previous prototype for 'cx23885_input_fini' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-input.c:76:6: warning: no previous prototype for 'cx23885_input_rx_work_handler' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ioctl.c:134:5: warning: no previous prototype for 'cx23885_g_register' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ioctl.c:185:5: warning: no previous prototype for 'cx23885_s_register' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ioctl.c:27:5: warning: no previous prototype for 'cx23885_g_chip_ident' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ir.c:101:6: warning: no previous prototype for 'cx23885_ir_tx_v4l2_dev_notify' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ir.c:37:6: warning: no previous prototype for 'cx23885_ir_rx_work_handler' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ir.c:60:6: warning: no previous prototype for 'cx23885_ir_tx_work_handler' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23885-ir.c:76:6: warning: no previous prototype for 'cx23885_ir_rx_v4l2_dev_notify' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23888-ir.c:1203:5: warning: no previous prototype for 'cx23888_ir_probe' [-Wmissing-prototypes] drivers/media/pci/cx23885/cx23888-ir.c:1253:5: warning: no previous prototype for 'cx23888_ir_remove' [-Wmissing-prototypes] drivers/media/pci/cx23885/netup-init.c:109:6: warning: no previous prototype for 'netup_initialize' [-Wmissing-prototypes] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx23885')
-rw-r--r--drivers/media/pci/cx23885/altera-ci.c45
-rw-r--r--drivers/media/pci/cx23885/cimax2.c17
-rw-r--r--drivers/media/pci/cx23885/cx23885-av.c1
-rw-r--r--drivers/media/pci/cx23885/cx23885-cards.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-core.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-dvb.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-f300.c1
-rw-r--r--drivers/media/pci/cx23885/cx23885-input.c1
-rw-r--r--drivers/media/pci/cx23885/cx23885-input.h2
-rw-r--r--drivers/media/pci/cx23885/cx23885-ioctl.c2
-rw-r--r--drivers/media/pci/cx23885/cx23885-ir.c1
-rw-r--r--drivers/media/pci/cx23885/cx23888-ir.c1
-rw-r--r--drivers/media/pci/cx23885/netup-init.c1
13 files changed, 45 insertions, 33 deletions
diff --git a/drivers/media/pci/cx23885/altera-ci.c b/drivers/media/pci/cx23885/altera-ci.c
index 495781ee4711..2926f7fadccd 100644
--- a/drivers/media/pci/cx23885/altera-ci.c
+++ b/drivers/media/pci/cx23885/altera-ci.c
@@ -263,7 +263,7 @@ static int netup_fpga_op_rw(struct fpga_internal *inter, int addr,
263} 263}
264 264
265/* flag - mem/io, read - read/write */ 265/* flag - mem/io, read - read/write */
266int altera_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, 266static int altera_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
267 u8 flag, u8 read, int addr, u8 val) 267 u8 flag, u8 read, int addr, u8 val)
268{ 268{
269 269
@@ -298,31 +298,32 @@ int altera_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
298 return mem; 298 return mem;
299} 299}
300 300
301int altera_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221, 301static int altera_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221,
302 int slot, int addr) 302 int slot, int addr)
303{ 303{
304 return altera_ci_op_cam(en50221, slot, 0, NETUP_CI_FLG_RD, addr, 0); 304 return altera_ci_op_cam(en50221, slot, 0, NETUP_CI_FLG_RD, addr, 0);
305} 305}
306 306
307int altera_ci_write_attribute_mem(struct dvb_ca_en50221 *en50221, 307static int altera_ci_write_attribute_mem(struct dvb_ca_en50221 *en50221,
308 int slot, int addr, u8 data) 308 int slot, int addr, u8 data)
309{ 309{
310 return altera_ci_op_cam(en50221, slot, 0, 0, addr, data); 310 return altera_ci_op_cam(en50221, slot, 0, 0, addr, data);
311} 311}
312 312
313int altera_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr) 313static int altera_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221,
314 int slot, u8 addr)
314{ 315{
315 return altera_ci_op_cam(en50221, slot, NETUP_CI_FLG_CTL, 316 return altera_ci_op_cam(en50221, slot, NETUP_CI_FLG_CTL,
316 NETUP_CI_FLG_RD, addr, 0); 317 NETUP_CI_FLG_RD, addr, 0);
317} 318}
318 319
319int altera_ci_write_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, 320static int altera_ci_write_cam_ctl(struct dvb_ca_en50221 *en50221, int slot,
320 u8 addr, u8 data) 321 u8 addr, u8 data)
321{ 322{
322 return altera_ci_op_cam(en50221, slot, NETUP_CI_FLG_CTL, 0, addr, data); 323 return altera_ci_op_cam(en50221, slot, NETUP_CI_FLG_CTL, 0, addr, data);
323} 324}
324 325
325int altera_ci_slot_reset(struct dvb_ca_en50221 *en50221, int slot) 326static int altera_ci_slot_reset(struct dvb_ca_en50221 *en50221, int slot)
326{ 327{
327 struct altera_ci_state *state = en50221->data; 328 struct altera_ci_state *state = en50221->data;
328 struct fpga_internal *inter = state->internal; 329 struct fpga_internal *inter = state->internal;
@@ -365,13 +366,13 @@ int altera_ci_slot_reset(struct dvb_ca_en50221 *en50221, int slot)
365 return 0; 366 return 0;
366} 367}
367 368
368int altera_ci_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot) 369static int altera_ci_slot_shutdown(struct dvb_ca_en50221 *en50221, int slot)
369{ 370{
370 /* not implemented */ 371 /* not implemented */
371 return 0; 372 return 0;
372} 373}
373 374
374int altera_ci_slot_ts_ctl(struct dvb_ca_en50221 *en50221, int slot) 375static int altera_ci_slot_ts_ctl(struct dvb_ca_en50221 *en50221, int slot)
375{ 376{
376 struct altera_ci_state *state = en50221->data; 377 struct altera_ci_state *state = en50221->data;
377 struct fpga_internal *inter = state->internal; 378 struct fpga_internal *inter = state->internal;
@@ -448,8 +449,8 @@ int altera_ci_irq(void *dev)
448} 449}
449EXPORT_SYMBOL(altera_ci_irq); 450EXPORT_SYMBOL(altera_ci_irq);
450 451
451int altera_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, int slot, 452static int altera_poll_ci_slot_status(struct dvb_ca_en50221 *en50221,
452 int open) 453 int slot, int open)
453{ 454{
454 struct altera_ci_state *state = en50221->data; 455 struct altera_ci_state *state = en50221->data;
455 456
@@ -459,7 +460,7 @@ int altera_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, int slot,
459 return state->status; 460 return state->status;
460} 461}
461 462
462void altera_hw_filt_release(void *main_dev, int filt_nr) 463static void altera_hw_filt_release(void *main_dev, int filt_nr)
463{ 464{
464 struct fpga_inode *temp_int = find_inode(main_dev); 465 struct fpga_inode *temp_int = find_inode(main_dev);
465 struct netup_hw_pid_filter *pid_filt = NULL; 466 struct netup_hw_pid_filter *pid_filt = NULL;
@@ -581,7 +582,7 @@ static void altera_toggle_fullts_streaming(struct netup_hw_pid_filter *pid_filt,
581 mutex_unlock(&inter->fpga_mutex); 582 mutex_unlock(&inter->fpga_mutex);
582} 583}
583 584
584int altera_pid_feed_control(void *demux_dev, int filt_nr, 585static int altera_pid_feed_control(void *demux_dev, int filt_nr,
585 struct dvb_demux_feed *feed, int onoff) 586 struct dvb_demux_feed *feed, int onoff)
586{ 587{
587 struct fpga_inode *temp_int = find_dinode(demux_dev); 588 struct fpga_inode *temp_int = find_dinode(demux_dev);
@@ -603,41 +604,41 @@ int altera_pid_feed_control(void *demux_dev, int filt_nr,
603} 604}
604EXPORT_SYMBOL(altera_pid_feed_control); 605EXPORT_SYMBOL(altera_pid_feed_control);
605 606
606int altera_ci_start_feed(struct dvb_demux_feed *feed, int num) 607static int altera_ci_start_feed(struct dvb_demux_feed *feed, int num)
607{ 608{
608 altera_pid_feed_control(feed->demux, num, feed, 1); 609 altera_pid_feed_control(feed->demux, num, feed, 1);
609 610
610 return 0; 611 return 0;
611} 612}
612 613
613int altera_ci_stop_feed(struct dvb_demux_feed *feed, int num) 614static int altera_ci_stop_feed(struct dvb_demux_feed *feed, int num)
614{ 615{
615 altera_pid_feed_control(feed->demux, num, feed, 0); 616 altera_pid_feed_control(feed->demux, num, feed, 0);
616 617
617 return 0; 618 return 0;
618} 619}
619 620
620int altera_ci_start_feed_1(struct dvb_demux_feed *feed) 621static int altera_ci_start_feed_1(struct dvb_demux_feed *feed)
621{ 622{
622 return altera_ci_start_feed(feed, 1); 623 return altera_ci_start_feed(feed, 1);
623} 624}
624 625
625int altera_ci_stop_feed_1(struct dvb_demux_feed *feed) 626static int altera_ci_stop_feed_1(struct dvb_demux_feed *feed)
626{ 627{
627 return altera_ci_stop_feed(feed, 1); 628 return altera_ci_stop_feed(feed, 1);
628} 629}
629 630
630int altera_ci_start_feed_2(struct dvb_demux_feed *feed) 631static int altera_ci_start_feed_2(struct dvb_demux_feed *feed)
631{ 632{
632 return altera_ci_start_feed(feed, 2); 633 return altera_ci_start_feed(feed, 2);
633} 634}
634 635
635int altera_ci_stop_feed_2(struct dvb_demux_feed *feed) 636static int altera_ci_stop_feed_2(struct dvb_demux_feed *feed)
636{ 637{
637 return altera_ci_stop_feed(feed, 2); 638 return altera_ci_stop_feed(feed, 2);
638} 639}
639 640
640int altera_hw_filt_init(struct altera_ci_config *config, int hw_filt_nr) 641static int altera_hw_filt_init(struct altera_ci_config *config, int hw_filt_nr)
641{ 642{
642 struct netup_hw_pid_filter *pid_filt = NULL; 643 struct netup_hw_pid_filter *pid_filt = NULL;
643 struct fpga_inode *temp_int = find_inode(config->dev); 644 struct fpga_inode *temp_int = find_inode(config->dev);
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
90int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, 91static 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
123int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, 124static 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
150int netup_ci_get_mem(struct cx23885_dev *dev) 151static 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
169int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, 170static 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
251int netup_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221, int slot, u8 addr) 252int 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
298int netup_ci_set_irq(struct dvb_ca_en50221 *en50221, u8 irq_mode) 300static 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
402int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221, int slot, int open) 404int 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
diff --git a/drivers/media/pci/cx23885/cx23885-av.c b/drivers/media/pci/cx23885/cx23885-av.c
index 134ebddd860f..e958a01fd554 100644
--- a/drivers/media/pci/cx23885/cx23885-av.c
+++ b/drivers/media/pci/cx23885/cx23885-av.c
@@ -22,6 +22,7 @@
22 */ 22 */
23 23
24#include "cx23885.h" 24#include "cx23885.h"
25#include "cx23885-av.h"
25 26
26void cx23885_av_work_handler(struct work_struct *work) 27void cx23885_av_work_handler(struct work_struct *work)
27{ 28{
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 5acdf954ff6b..6277e145f0b8 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -1427,7 +1427,7 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
1427 } 1427 }
1428} 1428}
1429 1429
1430int netup_jtag_io(void *device, int tms, int tdi, int read_tdo) 1430static int netup_jtag_io(void *device, int tms, int tdi, int read_tdo)
1431{ 1431{
1432 int data; 1432 int data;
1433 int tdo = 0; 1433 int tdo = 0;
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 4189d6431d3c..065ecd54bda3 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -303,7 +303,7 @@ static struct sram_channel cx23887_sram_channels[] = {
303 }, 303 },
304}; 304};
305 305
306void cx23885_irq_add(struct cx23885_dev *dev, u32 mask) 306static void cx23885_irq_add(struct cx23885_dev *dev, u32 mask)
307{ 307{
308 unsigned long flags; 308 unsigned long flags;
309 spin_lock_irqsave(&dev->pci_irqmask_lock, flags); 309 spin_lock_irqsave(&dev->pci_irqmask_lock, flags);
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 4379d8a6dad5..2f5b902e63ae 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -659,7 +659,7 @@ static struct mt2063_config terratec_mt2063_config[] = {
659 }, 659 },
660}; 660};
661 661
662int netup_altera_fpga_rw(void *device, int flag, int data, int read) 662static int netup_altera_fpga_rw(void *device, int flag, int data, int read)
663{ 663{
664 struct cx23885_dev *dev = (struct cx23885_dev *)device; 664 struct cx23885_dev *dev = (struct cx23885_dev *)device;
665 unsigned long timeout = jiffies + msecs_to_jiffies(1); 665 unsigned long timeout = jiffies + msecs_to_jiffies(1);
diff --git a/drivers/media/pci/cx23885/cx23885-f300.c b/drivers/media/pci/cx23885/cx23885-f300.c
index 93998f220986..5444cc526008 100644
--- a/drivers/media/pci/cx23885/cx23885-f300.c
+++ b/drivers/media/pci/cx23885/cx23885-f300.c
@@ -29,6 +29,7 @@
29 */ 29 */
30 30
31#include "cx23885.h" 31#include "cx23885.h"
32#include "cx23885-f300.h"
32 33
33#define F300_DATA GPIO_0 34#define F300_DATA GPIO_0
34#define F300_RESET GPIO_1 35#define F300_RESET GPIO_1
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 2004039482df..4f1055a194b5 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -40,6 +40,7 @@
40#include <media/v4l2-subdev.h> 40#include <media/v4l2-subdev.h>
41 41
42#include "cx23885.h" 42#include "cx23885.h"
43#include "cx23885-input.h"
43 44
44#define MODULE_NAME "cx23885" 45#define MODULE_NAME "cx23885"
45 46
diff --git a/drivers/media/pci/cx23885/cx23885-input.h b/drivers/media/pci/cx23885/cx23885-input.h
index 75ef15d3f523..87dc44e69977 100644
--- a/drivers/media/pci/cx23885/cx23885-input.h
+++ b/drivers/media/pci/cx23885/cx23885-input.h
@@ -23,7 +23,7 @@
23 23
24#ifndef _CX23885_INPUT_H_ 24#ifndef _CX23885_INPUT_H_
25#define _CX23885_INPUT_H_ 25#define _CX23885_INPUT_H_
26int cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events); 26void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events);
27 27
28int cx23885_input_init(struct cx23885_dev *dev); 28int cx23885_input_init(struct cx23885_dev *dev);
29void cx23885_input_fini(struct cx23885_dev *dev); 29void cx23885_input_fini(struct cx23885_dev *dev);
diff --git a/drivers/media/pci/cx23885/cx23885-ioctl.c b/drivers/media/pci/cx23885/cx23885-ioctl.c
index 44812ca78899..ea9a614f3bbf 100644
--- a/drivers/media/pci/cx23885/cx23885-ioctl.c
+++ b/drivers/media/pci/cx23885/cx23885-ioctl.c
@@ -22,6 +22,8 @@
22 */ 22 */
23 23
24#include "cx23885.h" 24#include "cx23885.h"
25#include "cx23885-ioctl.h"
26
25#include <media/v4l2-chip-ident.h> 27#include <media/v4l2-chip-ident.h>
26 28
27int cx23885_g_chip_ident(struct file *file, void *fh, 29int cx23885_g_chip_ident(struct file *file, void *fh,
diff --git a/drivers/media/pci/cx23885/cx23885-ir.c b/drivers/media/pci/cx23885/cx23885-ir.c
index 7125247dd255..bfef19359291 100644
--- a/drivers/media/pci/cx23885/cx23885-ir.c
+++ b/drivers/media/pci/cx23885/cx23885-ir.c
@@ -24,6 +24,7 @@
24#include <media/v4l2-device.h> 24#include <media/v4l2-device.h>
25 25
26#include "cx23885.h" 26#include "cx23885.h"
27#include "cx23885-ir.h"
27#include "cx23885-input.h" 28#include "cx23885-input.h"
28 29
29#define CX23885_IR_RX_FIFO_SERVICE_REQ 0 30#define CX23885_IR_RX_FIFO_SERVICE_REQ 0
diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c
index c2bc39c58f82..c4bd1e95d33f 100644
--- a/drivers/media/pci/cx23885/cx23888-ir.c
+++ b/drivers/media/pci/cx23885/cx23888-ir.c
@@ -29,6 +29,7 @@
29#include <media/rc-core.h> 29#include <media/rc-core.h>
30 30
31#include "cx23885.h" 31#include "cx23885.h"
32#include "cx23888-ir.h"
32 33
33static unsigned int ir_888_debug; 34static unsigned int ir_888_debug;
34module_param(ir_888_debug, int, 0644); 35module_param(ir_888_debug, int, 0644);
diff --git a/drivers/media/pci/cx23885/netup-init.c b/drivers/media/pci/cx23885/netup-init.c
index f4893e69cd89..0044fef7ca24 100644
--- a/drivers/media/pci/cx23885/netup-init.c
+++ b/drivers/media/pci/cx23885/netup-init.c
@@ -24,6 +24,7 @@
24 */ 24 */
25 25
26#include "cx23885.h" 26#include "cx23885.h"
27#include "netup-init.h"
27 28
28static void i2c_av_write(struct i2c_adapter *i2c, u16 reg, u8 val) 29static void i2c_av_write(struct i2c_adapter *i2c, u16 reg, u8 val)
29{ 30{