Skip to contentSkip to conversation

drivers/media/dvb/: small cleanups

PATCH In review Adrian Bunk 2 participants 2 messages Nov 19, 2005 – Nov 20, 2005 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/media/dvb/: small cleanups

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

---

 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(-)
drivers/media/dvb/b2c2/flexcop-hw-filter.c renamed from drivers/media/dvb/b2c2/flexcop-hw-filter.c.old +1 -1
@@ -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);
 }
drivers/media/dvb/dvb-usb/a800.c renamed from drivers/media/dvb/dvb-usb/a800.c.old +1 -1
@@ -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),
drivers/media/dvb/dvb-usb/digitv.c renamed from drivers/media/dvb/dvb-usb/digitv.c.old +1 -1
@@ -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];
 
drivers/media/dvb/dvb-usb/dvb-usb-init.c renamed from drivers/media/dvb/dvb-usb/dvb-usb-init.c.old +1 -1
@@ -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);
drivers/media/dvb/ttpci/ttpci-eeprom.c renamed from drivers/media/dvb/ttpci/ttpci-eeprom.c.old +1 -0
@@ -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)
drivers/media/dvb/ttpci/av7110_ca.c renamed from drivers/media/dvb/ttpci/av7110_ca.c.old +1 -0
@@ -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)
#1 lore raw
Quoted 7 lines · On Sat, Nov 19, 2005 Adrian Bunk wrote:

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

I added your patch to linuxtv.org CVS.

Thanks,
Johannes

Quoted 79 lines
 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(-)
drivers/media/dvb/b2c2/flexcop-hw-filter.c renamed from drivers/media/dvb/b2c2/flexcop-hw-filter.c.old +1 -1
@@ -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);
 }
drivers/media/dvb/dvb-usb/a800.c renamed from drivers/media/dvb/dvb-usb/a800.c.old +1 -1
@@ -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),
drivers/media/dvb/dvb-usb/digitv.c renamed from drivers/media/dvb/dvb-usb/digitv.c.old +1 -1
@@ -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];
 
drivers/media/dvb/dvb-usb/dvb-usb-init.c renamed from drivers/media/dvb/dvb-usb/dvb-usb-init.c.old +1 -1
@@ -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);
drivers/media/dvb/ttpci/ttpci-eeprom.c renamed from drivers/media/dvb/ttpci/ttpci-eeprom.c.old +1 -0
@@ -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)
drivers/media/dvb/ttpci/av7110_ca.c renamed from drivers/media/dvb/ttpci/av7110_ca.c.old +1 -0
@@ -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)

_______________________________________________
linux-dvb-maintainer mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb-maintainer