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

Commit 58f9b0b0 authored by Grant Likely's avatar Grant Likely
Browse files

of: eliminate of_device->node and dev_archdata->{of,prom}_node 



This patch eliminates the node pointer from struct of_device and the
of_node (or prom_node) pointer from struct dev_archdata since the node
pointer is now part of struct device proper when CONFIG_OF is set, and
all users of the old pointer locations have already been converted over
to use device->of_node.

Also remove dev_archdata_{get,set}_node() as it is no longer used by
anything.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 61c7a080

arch/microblaze/include/asm/device.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -12,9 +12,6 @@ 
struct device_node;

struct device_node;





struct dev_archdata {

struct dev_archdata {

	/* Optional pointer to an OF device node */

	struct device_node	*of_node;



	/* DMA operations on that device */

	/* DMA operations on that device */

	struct dma_map_ops	*dma_ops;

	struct dma_map_ops	*dma_ops;

	void                    *dma_data;

	void                    *dma_data;
@@ -23,18 +20,6 @@ struct dev_archdata { 
struct pdev_archdata {

struct pdev_archdata {

};

};





static inline void dev_archdata_set_node(struct dev_archdata *ad,

					 struct device_node *np)

{

	ad->of_node = np;

}



static inline struct device_node *

dev_archdata_get_node(const struct dev_archdata *ad)

{

	return ad->of_node;

}



#endif /* _ASM_MICROBLAZE_DEVICE_H */

#endif /* _ASM_MICROBLAZE_DEVICE_H */

arch/microblaze/include/asm/of_device.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ 
 * probed using OF properties.

 * probed using OF properties.

 */

 */

struct of_device {

struct of_device {

	struct device_node	*node; /* to be obsoleted */

	u64			dma_mask; /* DMA mask */

	u64			dma_mask; /* DMA mask */

	struct device		dev; /* Generic device interface */

	struct device		dev; /* Generic device interface */

};

};

arch/microblaze/kernel/of_device.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -49,12 +49,10 @@ struct of_device *of_device_alloc(struct device_node *np, 
	if (!dev)

	if (!dev)

		return NULL;

		return NULL;





	dev->node = of_node_get(np);

	dev->dev.of_node = of_node_get(np);

	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.parent = parent;

	dev->dev.parent = parent;

	dev->dev.release = of_release_dev;

	dev->dev.release = of_release_dev;

	dev->dev.archdata.of_node = np;

	dev->dev.of_node = np;





	if (bus_id)

	if (bus_id)

		dev_set_name(&dev->dev, bus_id);

		dev_set_name(&dev->dev, bus_id);

arch/powerpc/include/asm/device.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -10,9 +10,6 @@ struct dma_map_ops; 
struct device_node;

struct device_node;





struct dev_archdata {

struct dev_archdata {

	/* Optional pointer to an OF device node */

	struct device_node	*of_node;



	/* DMA operations on that device */

	/* DMA operations on that device */

	struct dma_map_ops	*dma_ops;

	struct dma_map_ops	*dma_ops;
@@ -30,18 +27,6 @@ struct dev_archdata { 
#endif

#endif

};

};





static inline void dev_archdata_set_node(struct dev_archdata *ad,

					 struct device_node *np)

{

	ad->of_node = np;

}



static inline struct device_node *

dev_archdata_get_node(const struct dev_archdata *ad)

{

	return ad->of_node;

}



struct pdev_archdata {

struct pdev_archdata {

};

};

arch/powerpc/include/asm/of_device.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */

 */

struct of_device

struct of_device

{

{

	struct device_node	*node;		/* to be obsoleted */

	u64			dma_mask;	/* DMA mask */

	u64			dma_mask;	/* DMA mask */

	struct device		dev;		/* Generic device interface */

	struct device		dev;		/* Generic device interface */

};

};