Skip to content

Commit

Permalink
of/device: Move struct of_device define outside of CONFIG_OF_DEVICE test
Browse files Browse the repository at this point in the history
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@oracle.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
  • Loading branch information
Grant Likely committed Jul 5, 2010
1 parent 8cec0e7 commit f9f5a46
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions include/linux/of_device.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down

0 comments on commit f9f5a46

Please sign in to comment.