diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-18 18:10:45 -0400 |
commit | 58f9b0b02414062eaff46716bc04b47d7e79add5 (patch) | |
tree | fa5265f4c37c2f4afb42a126f39cccc9602e06a2 /drivers/of | |
parent | 61c7a080a5a061c976988fd4b844dfb468dda255 (diff) |
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: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/of_i2c.c | 1 | ||||
-rw-r--r-- | drivers/of/of_mdio.c | 1 | ||||
-rw-r--r-- | drivers/of/of_spi.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 604ba966e1c9..ab6522c8e4fe 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c | |||
@@ -42,7 +42,6 @@ void of_register_i2c_devices(struct i2c_adapter *adap, | |||
42 | 42 | ||
43 | info.addr = be32_to_cpup(addr); | 43 | info.addr = be32_to_cpup(addr); |
44 | 44 | ||
45 | dev_archdata_set_node(&dev_ad, node); | ||
46 | info.of_node = node; | 45 | info.of_node = node; |
47 | info.archdata = &dev_ad; | 46 | info.archdata = &dev_ad; |
48 | 47 | ||
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 01d794abe105..794fbc2ef73d 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c | |||
@@ -79,7 +79,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) | |||
79 | /* Associate the OF node with the device structure so it | 79 | /* Associate the OF node with the device structure so it |
80 | * can be looked up later */ | 80 | * can be looked up later */ |
81 | of_node_get(child); | 81 | of_node_get(child); |
82 | dev_archdata_set_node(&phy->dev.archdata, child); | ||
83 | phy->dev.of_node = child; | 82 | phy->dev.of_node = child; |
84 | 83 | ||
85 | /* All data is now stored in the phy struct; register it */ | 84 | /* All data is now stored in the phy struct; register it */ |
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c index f3119a0836af..5fed7e3c7da3 100644 --- a/drivers/of/of_spi.c +++ b/drivers/of/of_spi.c | |||
@@ -80,7 +80,6 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np) | |||
80 | /* Store a pointer to the node in the device structure */ | 80 | /* Store a pointer to the node in the device structure */ |
81 | of_node_get(nc); | 81 | of_node_get(nc); |
82 | spi->dev.of_node = nc; | 82 | spi->dev.of_node = nc; |
83 | spi->dev.archdata.of_node = nc; | ||
84 | 83 | ||
85 | /* Register the new device */ | 84 | /* Register the new device */ |
86 | request_module(spi->modalias); | 85 | request_module(spi->modalias); |