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

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

powerpc: remove references to of_device and to_of_device 



of_device is just a #define alias to platform_device.  This patch
replaces all references to it with platform_device.

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

arch/powerpc/kernel/ibmebus.c

+4 −4
Original line number Diff line number Diff line
@@ -140,19 +140,19 @@ static struct dma_map_ops ibmebus_dma_ops = { 


static int ibmebus_match_path(struct device *dev, void *data)

{

	struct device_node *dn = to_of_device(dev)->dev.of_node;

	struct device_node *dn = to_platform_device(dev)->dev.of_node;

	return (dn->full_name &&

		(strcasecmp((char *)data, dn->full_name) == 0));

}



static int ibmebus_match_node(struct device *dev, void *data)

{

	return to_of_device(dev)->dev.of_node == data;

	return to_platform_device(dev)->dev.of_node == data;

}



static int ibmebus_create_device(struct device_node *dn)

{

	struct of_device *dev;

	struct platform_device *dev;

	int ret;



	dev = of_device_alloc(dn, NULL, &ibmebus_bus_device);
@@ -298,7 +298,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus, 


	if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,

				   ibmebus_match_path))) {

		of_device_unregister(to_of_device(dev));

		of_device_unregister(to_platform_device(dev));



		kfree(path);

		return count;

arch/powerpc/kernel/of_platform.c

+4 −4
Original line number Diff line number Diff line
@@ -54,16 +54,16 @@ const struct of_device_id of_default_bus_ids[] = { 


static int of_dev_node_match(struct device *dev, void *data)

{

	return to_of_device(dev)->dev.of_node == data;

	return to_platform_device(dev)->dev.of_node == data;

}



struct of_device *of_find_device_by_node(struct device_node *np)

struct platform_device *of_find_device_by_node(struct device_node *np)

{

	struct device *dev;



	dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);

	if (dev)

		return to_of_device(dev);

		return to_platform_device(dev);

	return NULL;

}

EXPORT_SYMBOL(of_find_device_by_node);
@@ -76,7 +76,7 @@ EXPORT_SYMBOL(of_find_device_by_node); 
 * lacking some bits needed here.

 */



static int __devinit of_pci_phb_probe(struct of_device *dev,

static int __devinit of_pci_phb_probe(struct platform_device *dev,

				      const struct of_device_id *match)

{

	struct pci_controller *phb;

arch/powerpc/platforms/512x/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static void psc_clks_init(void) 
{

	struct device_node *np;

	const u32 *cell_index;

	struct of_device *ofdev;

	struct platform_device *ofdev;



	for_each_compatible_node(np, NULL, "fsl,mpc5121-psc") {

		cell_index = of_get_property(np, "cell-index", NULL);

arch/powerpc/platforms/52xx/mpc52xx_gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
	return 0;

}



static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev,

static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev,

					const struct of_device_id *match)

{

	struct mpc52xx_gpiochip *chip;
@@ -179,7 +179,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev, 
	return 0;

}



static int mpc52xx_gpiochip_remove(struct of_device *ofdev)

static int mpc52xx_gpiochip_remove(struct platform_device *ofdev)

{

	return -EBUSY;

}
@@ -310,7 +310,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
	return 0;

}



static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev,

static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev,

					const struct of_device_id *match)

{

	struct mpc52xx_gpiochip *chip;

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

+2 −2
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt, 
/* ---------------------------------------------------------------------

 * of_platform bus binding code

 */

static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev,

static int __devinit mpc52xx_gpt_probe(struct platform_device *ofdev,

				       const struct of_device_id *match)

{

	struct mpc52xx_gpt_priv *gpt;
@@ -766,7 +766,7 @@ static int __devinit mpc52xx_gpt_probe(struct of_device *ofdev, 
	return 0;

}



static int mpc52xx_gpt_remove(struct of_device *ofdev)

static int mpc52xx_gpt_remove(struct platform_device *ofdev)

{

	return -EBUSY;

}