[2.6 patch] drivers/media/dvb/: small cleanups

Adrian Bunk
2005-11-19T20:32:49Z

This patch contains the following cleanups:
- make needlessly global functions static
- every file should #include the headers containing the prototypes for
it's global functions

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

drivers/media/dvb/b2c2/flexcop-hw-filter.c | 2 +-
drivers/media/dvb/dvb-usb/a800.c | 2 +-
drivers/media/dvb/dvb-usb/digitv.c | 2 +-
drivers/media/dvb/dvb-usb/dvb-usb-init.c | 2 +-
drivers/media/dvb/ttpci/av7110_ca.c | 1 +
drivers/media/dvb/ttpci/ttpci-eeprom.c | 1 +
6 files changed, 6 insertions(+), 4 deletions(-)

--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/b2c2/flexcop-hw-filter.c.old 2005-11-19 03:55:04.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/b2c2/flexcop-hw-filter.c 2005-11-19 03:55:16.000000000 +0100
@@ -19,7 +19,7 @@
flexcop_set_ibi_value(ctrl_208,SMC_Enable_sig,onoff);
}

-void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff)
+static void flexcop_null_filter_ctrl(struct flexcop_device *fc, int onoff)
{
flexcop_set_ibi_value(ctrl_208,Null_filter_sig,onoff);
}
--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/a800.c.old 2005-11-19 03:55:57.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/a800.c 2005-11-19 03:56:05.000000000 +0100
@@ -65,7 +65,7 @@

};

-int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
u8 key[5];
if (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),
--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/digitv.c.old 2005-11-19 03:56:30.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/digitv.c 2005-11-19 03:56:39.000000000 +0100
@@ -148,7 +148,7 @@
};

/* TODO is it really the NEC protocol ? */
-int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
u8 key[5];

--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/dvb-usb-init.c.old 2005-11-19 03:56:58.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/dvb-usb/dvb-usb-init.c 2005-11-19 03:57:07.000000000 +0100
@@ -23,7 +23,7 @@
MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0).");

/* general initialization functions */
-int dvb_usb_exit(struct dvb_usb_device *d)
+static int dvb_usb_exit(struct dvb_usb_device *d)
{
deb_info("state before exiting everything: %x\n",d->state);
dvb_usb_remote_exit(d);
--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/ttpci/ttpci-eeprom.c.old 2005-11-19 03:57:29.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/ttpci/ttpci-eeprom.c 2005-11-19 03:57:43.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/string.h>
#include <linux/i2c.h>

+#include "ttpci-eeprom.h"

#if 1
#define dprintk(x...) do { printk(x); } while (0)
--- linux-2.6.15-rc1-mm2-full/drivers/media/dvb/ttpci/av7110_ca.c.old 2005-11-19 03:58:05.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/drivers/media/dvb/ttpci/av7110_ca.c 2005-11-19 03:58:17.000000000 +0100
@@ -40,6 +40,7 @@

#include "av7110.h"
#include "av7110_hw.h"
+#include "av7110_ca.h"

void CI_handle(struct av7110 *av7110, u8 *data, u16 len)