Re: [GIT PATCHES for 2.6.28] V4L/DVB fixes

[Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>]

On Thu, 25 Dec 2008 09:19:07 +0100
Ingo Molnar <mingo@xxxxxxx> wrote:

> FYI, v2.6.28 still fails to build with certain configs:
> 
>  drivers/media/dvb/built-in.o: In function `dib7000p_set_gpio':
>  (.text+0x3f242): multiple definition of `dib7000p_set_gpio'
>  drivers/media/video/built-in.o:(.text+0xb8c1e): first defined here
>  drivers/media/dvb/built-in.o: In function `dib7000p_i2c_enumeration':
>  (.text+0x3f282): multiple definition of `dib7000p_i2c_enumeration'
>  drivers/media/video/built-in.o:(.text+0xb8c3e): first defined here
>  drivers/media/dvb/built-in.o: In function `dib7000p_set_wbd_ref':
>  (.text+0x3f1c1): multiple definition of `dib7000p_set_wbd_ref'
>  drivers/media/video/built-in.o:(.text+0xb8bfe): first defined here
>    LD      drivers/net/built-in.o
>  make[2]: *** [drivers/media/built-in.o] Error 1
> 
> Config attached. The patch below works it around in tip/master. Can test 
> any patch for this bug.

Please test the enclosed patch.

Cheers,
Mauro

---
Kbuild: fix compilation when dib7000p is not defined

dib7000p.h defines a few extern symbols when CONFIG_DVB_DIB7000P is not set. since the
header is used on more than one driver, this causes symbol duplication, as pointed by
Ingo Molnar <mingo@xxxxxxx>:

drivers/media/dvb/built-in.o: In function `dib7000p_set_gpio':
(.text+0x3f242): multiple definition of `dib7000p_set_gpio'
drivers/media/video/built-in.o:(.text+0xb8c1e): first defined here
drivers/media/dvb/built-in.o: In function `dib7000p_i2c_enumeration':
(.text+0x3f282): multiple definition of `dib7000p_i2c_enumeration'
drivers/media/video/built-in.o:(.text+0xb8c3e): first defined here
drivers/media/dvb/built-in.o: In function `dib7000p_set_wbd_ref':
(.text+0x3f1c1): multiple definition of `dib7000p_set_wbd_ref'
drivers/media/video/built-in.o:(.text+0xb8bfe): first defined here
  LD      drivers/net/built-in.o
make[2]: *** [drivers/media/built-in.o] Error 1

Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h
index 3e81268..aab8112 100644
--- a/drivers/media/dvb/frontends/dib7000p.h
+++ b/drivers/media/dvb/frontends/dib7000p.h
@@ -66,7 +66,8 @@ struct i2c_adapter *dib7000p_get_i2c_master(struct dvb_frontend *fe,
 	return NULL;
 }
 
-extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
+static inline
+int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
 				    int no_of_demods, u8 default_addr,
 				    struct dib7000p_config cfg[])
 {
@@ -74,13 +75,15 @@ extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
 	return -ENODEV;
 }
 
-extern int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+static inline
+int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return -ENODEV;
 }
 
-extern int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+static inline
+int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return -ENODEV;


_______________________________________________
v4l-dvb-maintainer mailing list
v4l-dvb-maintainer@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer