Prev: [PATCH 2/2] i2c: Add OF-style registration and binding
Next: [PATCH v2 1/5] gpiolib: cosmetic improvements for error handling in gpiochip_add()
From: Randy Dunlap on 10 Jun 2010 01:40
On 06/09/10 21:54, Grant Likely wrote:
> Some code uses of_device even when CONFIG_OF_DEVICE is not set. This
> patch makes of_device valid all the time by moving it outside of the
> ifdef CONFIG_OF_DEVICE test.
>
> Reported-by: Randy Dunlap <randy.dunlap(a)oracle.com>
> Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca>
> ---
>
> Hi Randy,
>
> Here's what I applied to my tree to fix the niu driver compile warning.
> I've compile tested it on several architectures, and am pushing it out
> to my linux-next branch now.

Acked-by: Randy Dunlap <randy.dunlap(a)oracle.com>

along with the niu.c patch, of course.

> g.
>
> include/linux/of_device.h | 12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/of_device.h b/include/linux/of_device.h
> index c877d54..8cd1fe7 100644
> --- a/include/linux/of_device.h
> +++ b/include/linux/of_device.h
> @@ -1,13 +1,6 @@
> #ifndef _LINUX_OF_DEVICE_H
> #define _LINUX_OF_DEVICE_H
>
> -#ifdef CONFIG_OF_DEVICE
> -#include <linux/device.h>
> -#include <linux/platform_device.h>
> -#include <linux/of.h>
> -#include <linux/mod_devicetable.h>
> -
> -
> /*
> * The of_device *was* a kind of "base class" that was a superset of
> * struct device for use by devices attached to an OF node and probed
> @@ -22,7 +15,12 @@
> * from the kernel.
> */
> #define of_device platform_device
> +#include <linux/platform_device.h>
>
> +#ifdef CONFIG_OF_DEVICE
> +#include <linux/device.h>
> +#include <linux/of.h>
> +#include <linux/mod_devicetable.h>
> #include <asm/of_device.h>
>
> #define to_of_device(d) container_of(d, struct of_device, dev)
>


--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 2/2] i2c: Add OF-style registration and binding
Next: [PATCH v2 1/5] gpiolib: cosmetic improvements for error handling in gpiochip_add()