| Message ID | 4A085455.5040108@oracle.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Mon, 11 May 2009 16:37:05 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Mon, 11 May 2009 15:06:17 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1M3YUz-0005fN-GM; Mon, 11 May 2009 16:37:05 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350AbZEKQhA (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Mon, 11 May 2009 12:37:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753878AbZEKQhA (ORCPT <rfc822;linux-media-outgoing>); Mon, 11 May 2009 12:37:00 -0400 Received: from acsinet11.oracle.com ([141.146.126.233]:48959 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752733AbZEKQg7 (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 11 May 2009 12:36:59 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by acsinet11.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n4BGa51s003251 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 11 May 2009 16:36:09 GMT Received: from abhmt005.oracle.com (abhmt005.oracle.com [141.146.116.14]) by acsinet15.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n4BGa9Vg010368; Mon, 11 May 2009 16:36:09 GMT Received: from [192.168.1.4] (/71.182.83.218) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 May 2009 09:35:41 -0700 Message-ID: <4A085455.5040108@oracle.com> Date: Mon, 11 May 2009 09:37:41 -0700 From: Randy Dunlap <randy.dunlap@oracle.com> Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Stephen Rothwell <sfr@canb.auug.org.au> CC: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, linux-media@vger.kernel.org, Mauro Carvalho Chehab <mchehab@infradead.org> Subject: [PATCH -next] v4l2: handle unregister for non-I2C builds References: <20090511161442.3e9d9cb9.sfr@canb.auug.org.au> In-Reply-To: <20090511161442.3e9d9cb9.sfr@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: abhmt005.oracle.com [141.146.116.14] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A010205.4A0853DE.029A:SCFSTAT5015188,ss=1,fgs=0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Randy Dunlap
May 11, 2009, 4:37 p.m. UTC
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(+)
Comments
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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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).]
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).]
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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 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);