* [PATCH 1/2] bttv: Move I2C IR initialization
@ 2010-02-16 17:21 Jean Delvare
2010-03-06 9:24 ` Németh Márton
0 siblings, 1 reply; 4+ messages in thread
From: Jean Delvare @ 2010-02-16 17:21 UTC (permalink / raw)
To: LMML
Move I2C IR initialization from just after I2C bus setup to right
before non-I2C IR initialization. This avoids the case where an I2C IR
device is blocking audio support (at least the PV951 suffers from
this). It is also more logical to group IR support together,
regardless of the connectivity.
This fixes bug #15184:
http://bugzilla.kernel.org/show_bug.cgi?id=15184
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
As this fixes a regression, I suggest pushing to Linus quickly. This is
a candidate for 2.6.32-stable too.
linux/drivers/media/video/bt8xx/bttv-driver.c | 1 +
linux/drivers/media/video/bt8xx/bttv-i2c.c | 10 +++++++---
linux/drivers/media/video/bt8xx/bttvp.h | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-i2c.c 2009-12-11 09:47:47.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-i2c.c 2010-02-16 18:14:34.000000000 +0100
@@ -409,9 +409,14 @@ int __devinit init_bttv_i2c(struct bttv
}
if (0 == btv->i2c_rc && i2c_scan)
do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
- /* Instantiate the IR receiver device, if present */
+ return btv->i2c_rc;
+}
+
+/* Instantiate the I2C IR receiver device, if present */
+void __devinit init_bttv_i2c_ir(struct bttv *btv)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
if (0 == btv->i2c_rc) {
struct i2c_board_info info;
/* The external IR receiver is at i2c address 0x34 (0x35 for
@@ -432,7 +437,6 @@ int __devinit init_bttv_i2c(struct bttv
i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
}
#endif
- return btv->i2c_rc;
}
int __devexit fini_bttv_i2c(struct bttv *btv)
--- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttvp.h 2009-04-06 10:10:24.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/bt8xx/bttvp.h 2010-02-16 18:13:31.000000000 +0100
@@ -281,6 +281,7 @@ extern unsigned int bttv_debug;
extern unsigned int bttv_gpio;
extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv);
+extern void init_bttv_i2c_ir(struct bttv *btv);
extern int fini_bttv_i2c(struct bttv *btv);
#define bttv_printk if (bttv_verbose) printk
--- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-driver.c 2009-12-11 09:47:47.000000000 +0100
+++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-driver.c 2010-02-16 18:13:31.000000000 +0100
@@ -4498,6 +4498,7 @@ static int __devinit bttv_probe(struct p
request_modules(btv);
}
+ init_bttv_i2c_ir(btv);
bttv_input_init(btv);
/* everything is fine */
--
Jean Delvare
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] bttv: Move I2C IR initialization
2010-02-16 17:21 [PATCH 1/2] bttv: Move I2C IR initialization Jean Delvare
@ 2010-03-06 9:24 ` Németh Márton
2010-03-06 9:25 ` [PATCH] bttv: fix compiler warning before kernel 2.6.30 Németh Márton
0 siblings, 1 reply; 4+ messages in thread
From: Németh Márton @ 2010-03-06 9:24 UTC (permalink / raw)
To: Jean Delvare, Mauro Carvalho Chehab, Douglas Schilling Landgraf
Cc: V4L Mailing List
Hi,
Jean Delvare wrote:
> Move I2C IR initialization from just after I2C bus setup to right
> before non-I2C IR initialization. This avoids the case where an I2C IR
> device is blocking audio support (at least the PV951 suffers from
> this). It is also more logical to group IR support together,
> regardless of the connectivity.
Something could have gone wrong because this patch and the patch
at http://linuxtv.org/hg/v4l-dvb/rev/659e08177aa3 has the
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
and
#endif
pair at different places. The current result is the following compiler
warning:
bttv-i2c.c: In function 'init_bttv_i2c':
bttv-i2c.c:440: warning: control reaches end of non-void function
Regard,
Márton Németh
>
> This fixes bug #15184:
> http://bugzilla.kernel.org/show_bug.cgi?id=15184
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> ---
> As this fixes a regression, I suggest pushing to Linus quickly. This is
> a candidate for 2.6.32-stable too.
>
> linux/drivers/media/video/bt8xx/bttv-driver.c | 1 +
> linux/drivers/media/video/bt8xx/bttv-i2c.c | 10 +++++++---
> linux/drivers/media/video/bt8xx/bttvp.h | 1 +
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
> --- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-i2c.c 2009-12-11 09:47:47.000000000 +0100
> +++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-i2c.c 2010-02-16 18:14:34.000000000 +0100
> @@ -409,9 +409,14 @@ int __devinit init_bttv_i2c(struct bttv
> }
> if (0 == btv->i2c_rc && i2c_scan)
> do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
>
> - /* Instantiate the IR receiver device, if present */
> + return btv->i2c_rc;
> +}
> +
> +/* Instantiate the I2C IR receiver device, if present */
> +void __devinit init_bttv_i2c_ir(struct bttv *btv)
> +{
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
> if (0 == btv->i2c_rc) {
> struct i2c_board_info info;
> /* The external IR receiver is at i2c address 0x34 (0x35 for
> @@ -432,7 +437,6 @@ int __devinit init_bttv_i2c(struct bttv
> i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
> }
> #endif
> - return btv->i2c_rc;
> }
>
> int __devexit fini_bttv_i2c(struct bttv *btv)
> --- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttvp.h 2009-04-06 10:10:24.000000000 +0200
> +++ v4l-dvb/linux/drivers/media/video/bt8xx/bttvp.h 2010-02-16 18:13:31.000000000 +0100
> @@ -281,6 +281,7 @@ extern unsigned int bttv_debug;
> extern unsigned int bttv_gpio;
> extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
> extern int init_bttv_i2c(struct bttv *btv);
> +extern void init_bttv_i2c_ir(struct bttv *btv);
> extern int fini_bttv_i2c(struct bttv *btv);
>
> #define bttv_printk if (bttv_verbose) printk
> --- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-driver.c 2009-12-11 09:47:47.000000000 +0100
> +++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-driver.c 2010-02-16 18:13:31.000000000 +0100
> @@ -4498,6 +4498,7 @@ static int __devinit bttv_probe(struct p
> request_modules(btv);
> }
>
> + init_bttv_i2c_ir(btv);
> bttv_input_init(btv);
>
> /* everything is fine */
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] bttv: fix compiler warning before kernel 2.6.30
2010-03-06 9:24 ` Németh Márton
@ 2010-03-06 9:25 ` Németh Márton
2010-03-06 12:03 ` Jean Delvare
0 siblings, 1 reply; 4+ messages in thread
From: Németh Márton @ 2010-03-06 9:25 UTC (permalink / raw)
To: Jean Delvare, Mauro Carvalho Chehab, Douglas Schilling Landgraf
Cc: V4L Mailing List
From: Márton Németh <nm127@freemail.hu>
Fix the following compiler warnings when compiling before Linux
kernel version 2.6.30:
bttv-i2c.c: In function 'init_bttv_i2c':
bttv-i2c.c:440: warning: control reaches end of non-void function
Signed-off-by: Márton Németh <nm127@freemail.hu>
---
diff -r 41c5482f2dac linux/drivers/media/video/bt8xx/bttv-i2c.c
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Thu Mar 04 02:49:46 2010 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Sat Mar 06 10:22:55 2010 +0100
@@ -409,7 +409,6 @@
}
if (0 == btv->i2c_rc && i2c_scan)
do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
return btv->i2c_rc;
}
@@ -417,6 +416,7 @@
/* Instantiate the I2C IR receiver device, if present */
void __devinit init_bttv_i2c_ir(struct bttv *btv)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
if (0 == btv->i2c_rc) {
struct i2c_board_info info;
/* The external IR receiver is at i2c address 0x34 (0x35 for
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] bttv: fix compiler warning before kernel 2.6.30
2010-03-06 9:25 ` [PATCH] bttv: fix compiler warning before kernel 2.6.30 Németh Márton
@ 2010-03-06 12:03 ` Jean Delvare
0 siblings, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2010-03-06 12:03 UTC (permalink / raw)
To: Németh Márton
Cc: Mauro Carvalho Chehab, Douglas Schilling Landgraf,
V4L Mailing List
On Sat, 06 Mar 2010 10:25:24 +0100, Németh Márton wrote:
> From: Márton Németh <nm127@freemail.hu>
>
> Fix the following compiler warnings when compiling before Linux
> kernel version 2.6.30:
> bttv-i2c.c: In function 'init_bttv_i2c':
> bttv-i2c.c:440: warning: control reaches end of non-void function
>
> Signed-off-by: Márton Németh <nm127@freemail.hu>
Good catch.
Acked-by: Jean Delvare <khali@linux-fr.org>
Douglas, please apply quickly.
> ---
> diff -r 41c5482f2dac linux/drivers/media/video/bt8xx/bttv-i2c.c
> --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Thu Mar 04 02:49:46 2010 -0300
> +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Sat Mar 06 10:22:55 2010 +0100
> @@ -409,7 +409,6 @@
> }
> if (0 == btv->i2c_rc && i2c_scan)
> do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
>
> return btv->i2c_rc;
> }
> @@ -417,6 +416,7 @@
> /* Instantiate the I2C IR receiver device, if present */
> void __devinit init_bttv_i2c_ir(struct bttv *btv)
> {
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
> if (0 == btv->i2c_rc) {
> struct i2c_board_info info;
> /* The external IR receiver is at i2c address 0x34 (0x35 for
>
--
Jean Delvare
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-06 12:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-16 17:21 [PATCH 1/2] bttv: Move I2C IR initialization Jean Delvare
2010-03-06 9:24 ` Németh Márton
2010-03-06 9:25 ` [PATCH] bttv: fix compiler warning before kernel 2.6.30 Németh Márton
2010-03-06 12:03 ` Jean Delvare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox