From patchwork Fri Jun 12 19:31:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 29950 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5CJVZDU003923 for ; Fri, 12 Jun 2009 19:31:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756190AbZFLTb3 (ORCPT ); Fri, 12 Jun 2009 15:31:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755581AbZFLTb3 (ORCPT ); Fri, 12 Jun 2009 15:31:29 -0400 Received: from mail7.sea5.speakeasy.net ([69.17.117.9]:36823 "EHLO mail7.sea5.speakeasy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754924AbZFLTb2 (ORCPT ); Fri, 12 Jun 2009 15:31:28 -0400 Received: (qmail 2063 invoked from network); 12 Jun 2009 19:31:30 -0000 Received: from shell2.sea5.speakeasy.net ([69.17.116.3]) (envelope-sender ) by mail7.sea5.speakeasy.net (qmail-ldap-1.03) with AES256-SHA encrypted SMTP for ; 12 Jun 2009 19:31:30 -0000 Date: Fri, 12 Jun 2009 12:31:29 -0700 (PDT) From: Trent Piepho X-X-Sender: xyzzy@shell2.speakeasy.net To: Randy Dunlap cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: Re: [PATCH -next] v4l: expose function outside of ifdef/endif block In-Reply-To: <4A32A2CE.40002@oracle.com> Message-ID: References: <20090612185601.be53b034.sfr@canb.auug.org.au> <4A32A2CE.40002@oracle.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Fri, 12 Jun 2009, Randy Dunlap wrote: > From: Randy Dunlap > > Move v4l_bound_align_image() outside of an #ifdef CONFIG_I2C block > so that it is always built. Fixes a build error: clamp_align() should be moved as well, since it's only used by v4l_bound_align_image(). I'm attaching an alternate version that fixes this. Labeled the endif too. > drivers/media/video/v4l2-common.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > --- linux-next-20090612.orig/drivers/media/video/v4l2-common.c > +++ linux-next-20090612/drivers/media/video/v4l2-common.c > @@ -915,6 +915,7 @@ const unsigned short *v4l2_i2c_tuner_add > return NULL; > } > EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs); > +#endif > > /* Clamp x to be between min and max, aligned to a multiple of 2^align. min > * and max don't have to be aligned, but there must be at least one valid > @@ -986,5 +987,3 @@ void v4l_bound_align_image(u32 *w, unsig > } > } > EXPORT_SYMBOL_GPL(v4l_bound_align_image); > - > -#endif # HG changeset patch # User Trent Piepho # Date 1244834958 25200 # Node ID 23bd6516eafcc06ffb590073e744c7e17382aef9 # Parent 01fd4e3bd1c0fb52cb15acbd22ca7f4857170e6e v4l2: Move bounding code outside I2C ifdef block From: Trent Piepho Move v4l_bound_align_image() and clamp_align() outside of an ifdef block for I2C related code. Can cause an undefined reference to `v4l_bound_align_image' if I2C isn't enabled. Priority: high Signed-off-by: Trent Piepho Reported-by: Randy Dunlap diff -r 01fd4e3bd1c0 -r 23bd6516eafc linux/drivers/media/video/v4l2-common.c --- a/linux/drivers/media/video/v4l2-common.c Thu Jun 11 15:31:22 2009 -0700 +++ b/linux/drivers/media/video/v4l2-common.c Fri Jun 12 12:29:18 2009 -0700 @@ -997,6 +997,8 @@ const unsigned short *v4l2_i2c_tuner_add } EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs); +#endif /* defined(CONFIG_I2C) */ + /* Clamp x to be between min and max, aligned to a multiple of 2^align. min * and max don't have to be aligned, but there must be at least one valid * value. E.g., min=17,max=31,align=4 is not allowed as there are no multiples @@ -1067,5 +1069,3 @@ void v4l_bound_align_image(u32 *w, unsig } } EXPORT_SYMBOL_GPL(v4l_bound_align_image); - -#endif