* [2.6 patch] drivers/media/dvb/: small cleanups
@ 2005-11-19 7:52 Adrian Bunk
2005-11-20 2:06 ` [linux-dvb-maintainer] " Johannes Stezenbach
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2005-11-19 7:52 UTC (permalink / raw)
To: linux-dvb-maintainer; +Cc: linux-kernel
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [linux-dvb-maintainer] [2.6 patch] drivers/media/dvb/: small cleanups
2005-11-19 7:52 [2.6 patch] drivers/media/dvb/: small cleanups Adrian Bunk
@ 2005-11-20 2:06 ` Johannes Stezenbach
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Stezenbach @ 2005-11-20 2:06 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-dvb-maintainer, linux-kernel
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
>
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
I added your patch to linuxtv.org CVS.
Thanks,
Johannes
> 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)
>
>
> _______________________________________________
> linux-dvb-maintainer mailing list
> linux-dvb-maintainer@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb-maintainer
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-11-20 2:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-19 7:52 [2.6 patch] drivers/media/dvb/: small cleanups Adrian Bunk
2005-11-20 2:06 ` [linux-dvb-maintainer] " Johannes Stezenbach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox