[PATCH] tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE

[PATCH] tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE

[Kyle McMartin]

While poking at something using the for-3.12/* trees, I hit the
following compile error:
drivers/built-in.o: In function `tegra_pcie_map_irq':
/builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:640:
undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
drivers/built-in.o: In function `tegra_msi_map':
/builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:1227:
undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
make: *** [vmlinux] Error 1

Since our .config had CONFIG_CPU_IDLE off. We should probably provide
an empty function to handle this to avoid cluttering up pci-tegra.c
with conditionals.

Signed-off-by: Kyle McMartin <kyle-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

--- a/include/linux/tegra-cpuidle.h
+++ b/include/linux/tegra-cpuidle.h
@@ -14,6 +14,13 @@
 #ifndef __LINUX_TEGRA_CPUIDLE_H__
 #define __LINUX_TEGRA_CPUIDLE_H__
 
+#ifdef CONFIG_CPU_IDLE
 void tegra_cpuidle_pcie_irqs_in_use(void);
+#else
+static inline void tegra_cpuidle_pcie_irqs_in_use(void)
+{
+	return;
+}
+#endif
 
 #endif

Re: [PATCH] tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE

[Stephen Warren]

On 08/26/2013 09:30 AM, Kyle McMartin wrote:
> While poking at something using the for-3.12/* trees, I hit the
> following compile error:
> drivers/built-in.o: In function `tegra_pcie_map_irq':
> /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:640:
> undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> drivers/built-in.o: In function `tegra_msi_map':
> /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:1227:
> undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> make: *** [vmlinux] Error 1
> 
> Since our .config had CONFIG_CPU_IDLE off. We should probably provide
> an empty function to handle this to avoid cluttering up pci-tegra.c
> with conditionals.

Another approach would be to use if (IS_ENABLED(CPU_IDLE)) at the call
site. I guess the approach in this patch is better than that though,
since it doesn't pollute the callers with knowledge of when this
function is available.

Thierry, if you're OK with this, I can forward it on to arm-soc.

Re: [PATCH] tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE

[Thierry Reding]

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

On Mon, Aug 26, 2013 at 11:30:51AM -0400, Kyle McMartin wrote:
> While poking at something using the for-3.12/* trees, I hit the
> following compile error:
> drivers/built-in.o: In function `tegra_pcie_map_irq':
> /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:640:
> undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> drivers/built-in.o: In function `tegra_msi_map':
> /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:1227:
> undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> make: *** [vmlinux] Error 1
> 
> Since our .config had CONFIG_CPU_IDLE off. We should probably provide
> an empty function to handle this to avoid cluttering up pci-tegra.c
> with conditionals.
> 
> Signed-off-by: Kyle McMartin <kyle-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> 
> --- a/include/linux/tegra-cpuidle.h
> +++ b/include/linux/tegra-cpuidle.h
> @@ -14,6 +14,13 @@
>  #ifndef __LINUX_TEGRA_CPUIDLE_H__
>  #define __LINUX_TEGRA_CPUIDLE_H__
>  
> +#ifdef CONFIG_CPU_IDLE
>  void tegra_cpuidle_pcie_irqs_in_use(void);
> +#else
> +static inline void tegra_cpuidle_pcie_irqs_in_use(void)
> +{
> +	return;

There's technically no need for this return statement, but either way
the patch looks good, so:

Reviewed-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

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

Re: [PATCH] tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE

[Thierry Reding]

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

On Mon, Aug 26, 2013 at 04:19:59PM -0600, Stephen Warren wrote:
> On 08/26/2013 09:30 AM, Kyle McMartin wrote:
> > While poking at something using the for-3.12/* trees, I hit the
> > following compile error:
> > drivers/built-in.o: In function `tegra_pcie_map_irq':
> > /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:640:
> > undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> > drivers/built-in.o: In function `tegra_msi_map':
> > /builddir/build/BUILD/kernel-3.10.fc20/linux-3.11.0-0.rc6.git4.1.fc20.armv7hl/drivers/pci/host/pci-tegra.c:1227:
> > undefined reference to `tegra_cpuidle_pcie_irqs_in_use'
> > make: *** [vmlinux] Error 1
> > 
> > Since our .config had CONFIG_CPU_IDLE off. We should probably provide
> > an empty function to handle this to avoid cluttering up pci-tegra.c
> > with conditionals.
> 
> Another approach would be to use if (IS_ENABLED(CPU_IDLE)) at the call
> site. I guess the approach in this patch is better than that though,
> since it doesn't pollute the callers with knowledge of when this
> function is available.
> 
> Thierry, if you're OK with this, I can forward it on to arm-soc.

I agree. The dummy seems like the better option. Feel free to add my
Reviewed-by (in my reply to the original patch) when you forward.

Thanks,
Thierry

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