Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b505ff5e authored by Grant Likely's avatar Grant Likely
Browse files

of: kill struct of_device 



Now that the device tree node pointer has been moved out of struct
of_device and into the common struct device, there isn't anything
unique about of_device anymore.  In fact, there isn't much need
for a separate of_bus when all busses have access to OF style
probing.

arch/powerpc and arch/microblaze are moving away from using the of_bus
and using the regular platform bus instead for mmio devices.  This
patch makes of_device the same as platform_device as a stepping stone
in migrating of_platform_drivers over to the platform bus.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
parent 1636f8ac

arch/microblaze/include/asm/of_device.h

+0 −10
Original line number Diff line number Diff line
@@ -15,16 +15,6 @@ 
#include <linux/device.h>

#include <linux/of.h>



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and

 * probed using OF properties.

 */

struct of_device {

	struct device		dev; /* Generic device interface */

	struct pdev_archdata	archdata;

};



extern ssize_t of_device_get_modalias(struct of_device *ofdev,

					char *str, ssize_t len);

arch/powerpc/include/asm/of_device.h

+0 −11
Original line number Diff line number Diff line
@@ -5,17 +5,6 @@ 
#include <linux/device.h>

#include <linux/of.h>



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and

 * probed using OF properties.

 */

struct of_device

{

	struct device		dev;		/* Generic device interface */

	struct pdev_archdata	archdata;

};



extern struct of_device *of_device_alloc(struct device_node *np,

					 const char *bus_id,

					 struct device *parent);

arch/powerpc/include/asm/smu.h

+2 −2
Original line number Diff line number Diff line
@@ -457,8 +457,8 @@ extern void smu_poll(void); 
 */

extern int smu_init(void);

extern int smu_present(void);

struct of_device;

extern struct of_device *smu_get_ofdev(void);

struct platform_device;

extern struct platform_device *smu_get_ofdev(void);





/*

arch/sparc/include/asm/device.h

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
#include <asm/openprom.h>



struct device_node;

struct of_device;

struct platform_device;



struct dev_archdata {

	void			*iommu;

	void			*stc;

	void			*host_controller;

	struct of_device	*op;

	struct platform_device	*op;

	int			numa_node;

};

arch/sparc/include/asm/of_device.h

+0 −14
Original line number Diff line number Diff line
@@ -7,20 +7,6 @@ 
#include <linux/mod_devicetable.h>

#include <asm/openprom.h>



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and

 * probed using OF properties.

 */

struct of_device

{

	struct device			dev;

	u32				num_resources;

	struct resource			*resource;



	struct pdev_archdata		archdata;

};



extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);

extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);