[PATCH -next] soc_camera: depends on I2C

[PATCH -next] soc_camera: depends on I2C

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

soc_camera uses i2c_*() functions and has build errors when CONFIG_I2C=n:

ERROR: "i2c_new_device" [drivers/media/video/soc_camera.ko] undefined!
ERROR: "i2c_get_adapter" [drivers/media/video/soc_camera.ko] undefined!
ERROR: "i2c_put_adapter" [drivers/media/video/soc_camera.ko] undefined!
ERROR: "i2c_unregister_device" [drivers/media/video/soc_camera.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/media/video/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20090511.orig/drivers/media/video/Kconfig
+++ linux-next-20090511/drivers/media/video/Kconfig
@@ -694,7 +694,7 @@ config VIDEO_CAFE_CCIC
 
 config SOC_CAMERA
 	tristate "SoC camera support"
-	depends on VIDEO_V4L2 && HAS_DMA
+	depends on VIDEO_V4L2 && HAS_DMA && I2C
 	select VIDEOBUF_GEN
 	help
 	  SoC Camera is a common API to several cameras, not connecting


-- 
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

[PATCH -next] v4l2: handle unregister for non-I2C builds

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Build fails when CONFIG_I2C=n, so handle that case in the if block:

drivers/built-in.o: In function `v4l2_device_unregister':
(.text+0x157821): undefined reference to `i2c_unregister_device'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/media/video/v4l2-device.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20090511.orig/drivers/media/video/v4l2-device.c
+++ linux-next-20090511/drivers/media/video/v4l2-device.c
@@ -85,6 +85,7 @@ void v4l2_device_unregister(struct v4l2_
 	/* Unregister subdevs */
 	list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) {
 		v4l2_device_unregister_subdev(sd);
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 		if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) {
 			struct i2c_client *client = v4l2_get_subdevdata(sd);
 
@@ -95,6 +96,7 @@ void v4l2_device_unregister(struct v4l2_
 			if (client)
 				i2c_unregister_device(client);
 		}
+#endif
 	}
 }
 EXPORT_SYMBOL_GPL(v4l2_device_unregister);


-- 
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

Re: [PATCH -next] soc_camera: depends on I2C

[Guennadi Liakhovetski]

On Mon, 11 May 2009, Randy Dunlap wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> soc_camera uses i2c_*() functions and has build errors when CONFIG_I2C=n:
> 
> ERROR: "i2c_new_device" [drivers/media/video/soc_camera.ko] undefined!
> ERROR: "i2c_get_adapter" [drivers/media/video/soc_camera.ko] undefined!
> ERROR: "i2c_put_adapter" [drivers/media/video/soc_camera.ko] undefined!
> ERROR: "i2c_unregister_device" [drivers/media/video/soc_camera.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks, applied.

Guennadi

> ---
>  drivers/media/video/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-next-20090511.orig/drivers/media/video/Kconfig
> +++ linux-next-20090511/drivers/media/video/Kconfig
> @@ -694,7 +694,7 @@ config VIDEO_CAFE_CCIC
>  
>  config SOC_CAMERA
>  	tristate "SoC camera support"
> -	depends on VIDEO_V4L2 && HAS_DMA
> +	depends on VIDEO_V4L2 && HAS_DMA && I2C
>  	select VIDEOBUF_GEN
>  	help
>  	  SoC Camera is a common API to several cameras, not connecting
> 
> 
> -- 
> ~Randy
> LPC 2009, Sept. 23-25, Portland, Oregon
> http://linuxplumbersconf.org/2009/
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH -next] v4l2: handle unregister for non-I2C builds

[Paul Mundt]

On Mon, May 11, 2009 at 09:37:41AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Build fails when CONFIG_I2C=n, so handle that case in the if block:
> 
> drivers/built-in.o: In function `v4l2_device_unregister':
> (.text+0x157821): undefined reference to `i2c_unregister_device'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

This patch still has not been applied as far as I can tell, and builds
are still broken as a result, almost 2 weeks after the fact.

> ---
>  drivers/media/video/v4l2-device.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> --- linux-next-20090511.orig/drivers/media/video/v4l2-device.c
> +++ linux-next-20090511/drivers/media/video/v4l2-device.c
> @@ -85,6 +85,7 @@ void v4l2_device_unregister(struct v4l2_
>  	/* Unregister subdevs */
>  	list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) {
>  		v4l2_device_unregister_subdev(sd);
> +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
>  		if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) {
>  			struct i2c_client *client = v4l2_get_subdevdata(sd);
>  
> @@ -95,6 +96,7 @@ void v4l2_device_unregister(struct v4l2_
>  			if (client)
>  				i2c_unregister_device(client);
>  		}
> +#endif
>  	}
>  }
>  EXPORT_SYMBOL_GPL(v4l2_device_unregister);
> 
> 
> -- 
> ~Randy
> LPC 2009, Sept. 23-25, Portland, Oregon
> http://linuxplumbersconf.org/2009/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH -next] v4l2: handle unregister for non-I2C builds

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

On Fri, 22 May 2009 14:48:47 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
>
> On Mon, May 11, 2009 at 09:37:41AM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > Build fails when CONFIG_I2C=n, so handle that case in the if block:
> > 
> > drivers/built-in.o: In function `v4l2_device_unregister':
> > (.text+0x157821): undefined reference to `i2c_unregister_device'
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> 
> This patch still has not been applied as far as I can tell, and builds
> are still broken as a result, almost 2 weeks after the fact.

In fact there has been no updates to the v4l-dvb tree at all since
May 11.  Mauro?

I have reverted the patch that caused the build breakage ... (commit
d5bc7940d39649210f1affac1fa32f253cc45a81 "V4L/DVB (11673): v4l2-device:
unregister i2c_clients when unregistering the v4l2_device").

[By the way, an alternative fix might be to just define
V4L2_SUBDEV_FL_IS_I2C to be zero if CONFIG_I2C and CONFIG_I2C_MODULE are
not defined (gcc should then just elide the offending code).]
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH -next] v4l2: handle unregister for non-I2C builds

[Randy Dunlap]

Stephen Rothwell wrote:
> On Fri, 22 May 2009 14:48:47 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
>> On Mon, May 11, 2009 at 09:37:41AM -0700, Randy Dunlap wrote:
>>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>>
>>> Build fails when CONFIG_I2C=n, so handle that case in the if block:
>>>
>>> drivers/built-in.o: In function `v4l2_device_unregister':
>>> (.text+0x157821): undefined reference to `i2c_unregister_device'
>>>
>>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> This patch still has not been applied as far as I can tell, and builds
>> are still broken as a result, almost 2 weeks after the fact.
> 
> In fact there has been no updates to the v4l-dvb tree at all since
> May 11.  Mauro?

I got an 'hg' autocommit message for the patch on May-11, but that's
all I've seen/heard about it.

I'm really concerned about how slowly patches are merged for
linux-next trees... and not just for drivers/media/


> I have reverted the patch that caused the build breakage ... (commit
> d5bc7940d39649210f1affac1fa32f253cc45a81 "V4L/DVB (11673): v4l2-device:
> unregister i2c_clients when unregistering the v4l2_device").
> 
> [By the way, an alternative fix might be to just define
> V4L2_SUBDEV_FL_IS_I2C to be zero if CONFIG_I2C and CONFIG_I2C_MODULE are
> not defined (gcc should then just elide the offending code).]


-- 
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

Re: [PATCH -next] v4l2: handle unregister for non-I2C builds

[Mauro Carvalho Chehab]

Em Fri, 22 May 2009 17:55:54 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> On Fri, 22 May 2009 14:48:47 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
> >
> > On Mon, May 11, 2009 at 09:37:41AM -0700, Randy Dunlap wrote:
> > > From: Randy Dunlap <randy.dunlap@oracle.com>
> > > 
> > > Build fails when CONFIG_I2C=n, so handle that case in the if block:
> > > 
> > > drivers/built-in.o: In function `v4l2_device_unregister':
> > > (.text+0x157821): undefined reference to `i2c_unregister_device'
> > > 
> > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > This patch still has not been applied as far as I can tell, and builds
> > are still broken as a result, almost 2 weeks after the fact.
> 
> In fact there has been no updates to the v4l-dvb tree at all since
> May 11.  Mauro?

Sorry, this email were got by a wrong filtering rule here. Only today I
noticed it.

Anyway, the tree were updated yesterday, with Randy's patch. Sorry for the mess.
> 
> I have reverted the patch that caused the build breakage ... (commit
> d5bc7940d39649210f1affac1fa32f253cc45a81 "V4L/DVB (11673): v4l2-device:
> unregister i2c_clients when unregistering the v4l2_device").
> 
> [By the way, an alternative fix might be to just define
> V4L2_SUBDEV_FL_IS_I2C to be zero if CONFIG_I2C and CONFIG_I2C_MODULE are
> not defined (gcc should then just elide the offending code).]




Cheers,
Mauro