[PATCH] omap: zoom2: fix build break when CONFIG_WL12XX_PLATFORM_DATA=n

[PATCH] omap: zoom2: fix build break when CONFIG_WL12XX_PLATFORM_DATA=n

[Anand Gadiyar]

Fix this build break when CONFIG_WL12XX_PLATFORM_DATA is not set.

  LD      .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `zoom_peripherals_init':
/home/userdata/a0393673/kernels/mainline/linux-2.6/arch/arm/mach-omap2/board-zoom-peripherals.c:333: undefined reference to `wl12xx_set_platform_data'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Tony Lindgren <tony@atomide.com>
---
There are still many warnings about the function wl12xx_set_platform_data
being unused. Haven't fixed those. Ohad, care to take a look?

 include/linux/wl12xx.h |    7 +++++++
 1 file changed, 7 insertions(+)

Index: linux-2.6/include/linux/wl12xx.h
===================================================================
--- linux-2.6.orig/include/linux/wl12xx.h
+++ linux-2.6/include/linux/wl12xx.h
@@ -32,7 +32,14 @@ struct wl12xx_platform_data {
 	int board_ref_clock;
 };
 
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
 int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
+#else
+static int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
+{
+	return 0;
+}
+#endif
 const struct wl12xx_platform_data *wl12xx_get_platform_data(void);
 
 #endif

Re: [PATCH] omap: zoom2: fix build break when CONFIG_WL12XX_PLATFORM_DATA=n

[Ohad Ben-Cohen]

On Fri, Oct 1, 2010 at 10:33 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> Fix this build break when CONFIG_WL12XX_PLATFORM_DATA is not set.

A similar fix was already submitted and is pending to be merged
(http://permalink.gmane.org/gmane.linux.kernel.wireless.general/56595)

> There are still many warnings about the function wl12xx_set_platform_data
> being unused. Haven't fixed those. Ohad, care to take a look?

Sure. Which warnings do you refer to (I haven't seen any) ?

Thanks,
Ohad.

>
>  include/linux/wl12xx.h |    7 +++++++
>  1 file changed, 7 insertions(+)
>
> Index: linux-2.6/include/linux/wl12xx.h
> ===================================================================
> --- linux-2.6.orig/include/linux/wl12xx.h
> +++ linux-2.6/include/linux/wl12xx.h
> @@ -32,7 +32,14 @@ struct wl12xx_platform_data {
>        int board_ref_clock;
>  };
>
> +#ifdef CONFIG_WL12XX_PLATFORM_DATA
>  int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
> +#else
> +static int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
> +{
> +       return 0;
> +}
> +#endif
>  const struct wl12xx_platform_data *wl12xx_get_platform_data(void);
>
>  #endif
>

RE: [PATCH] omap: zoom2: fix build break when CONFIG_WL12XX_PLATFORM_DATA=n

[Anand Gadiyar]

Ohad Ben-Cohen wrote:
> On Fri, Oct 1, 2010 at 10:33 PM, Anand Gadiyar <gadiyar@ti.com> wrote:
> > Fix this build break when CONFIG_WL12XX_PLATFORM_DATA is not set.
>
> A similar fix was already submitted and is pending to be merged
> (http://permalink.gmane.org/gmane.linux.kernel.wireless.general/56595)
>
> > There are still many warnings about the function
wl12xx_set_platform_data
> > being unused. Haven't fixed those. Ohad, care to take a look?
>
> Sure. Which warnings do you refer to (I haven't seen any) ?
>

I picked up your patch and the warnings are gone. The key difference
was I missed marking the alternative function as an inline.

Without that, I was seeing warnings like these:
include/linux/wl12xx.h:42: warning: 'wl12xx_set_platform_data' defined but
not used

- Anand

Re: [PATCH] omap: zoom2: fix build break when CONFIG_WL12XX_PLATFORM_DATA=n

[Ohad Ben-Cohen]

On Sat, Oct 2, 2010 at 1:02 AM, Anand Gadiyar <gadiyar@ti.com> wrote:
> I picked up your patch and the warnings are gone. The key difference
> was I missed marking the alternative function as an inline.

Ok, thanks for the update.


>
> Without that, I was seeing warnings like these:
> include/linux/wl12xx.h:42: warning: 'wl12xx_set_platform_data' defined but
> not used
>
> - Anand
>