diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:29 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-18 18:10:44 -0400 |
commit | 61c7a080a5a061c976988fd4b844dfb468dda255 (patch) | |
tree | 8cb492b73f2755c38a6164d770da34d5af6486a0 /drivers/block/xsysace.c | |
parent | d12d42f744f805a9ccc33cd76f04b237cd83ce56 (diff) |
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.
(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r-- | drivers/block/xsysace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index e1c95e208a66..3094909b0613 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
@@ -1198,10 +1198,10 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match) | |||
1198 | dev_dbg(&op->dev, "ace_of_probe(%p, %p)\n", op, match); | 1198 | dev_dbg(&op->dev, "ace_of_probe(%p, %p)\n", op, match); |
1199 | 1199 | ||
1200 | /* device id */ | 1200 | /* device id */ |
1201 | id = of_get_property(op->node, "port-number", NULL); | 1201 | id = of_get_property(op->dev.of_node, "port-number", NULL); |
1202 | 1202 | ||
1203 | /* physaddr */ | 1203 | /* physaddr */ |
1204 | rc = of_address_to_resource(op->node, 0, &res); | 1204 | rc = of_address_to_resource(op->dev.of_node, 0, &res); |
1205 | if (rc) { | 1205 | if (rc) { |
1206 | dev_err(&op->dev, "invalid address\n"); | 1206 | dev_err(&op->dev, "invalid address\n"); |
1207 | return rc; | 1207 | return rc; |
@@ -1209,11 +1209,11 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match) | |||
1209 | physaddr = res.start; | 1209 | physaddr = res.start; |
1210 | 1210 | ||
1211 | /* irq */ | 1211 | /* irq */ |
1212 | irq = irq_of_parse_and_map(op->node, 0); | 1212 | irq = irq_of_parse_and_map(op->dev.of_node, 0); |
1213 | 1213 | ||
1214 | /* bus width */ | 1214 | /* bus width */ |
1215 | bus_width = ACE_BUS_WIDTH_16; | 1215 | bus_width = ACE_BUS_WIDTH_16; |
1216 | if (of_find_property(op->node, "8-bit", NULL)) | 1216 | if (of_find_property(op->dev.of_node, "8-bit", NULL)) |
1217 | bus_width = ACE_BUS_WIDTH_8; | 1217 | bus_width = ACE_BUS_WIDTH_8; |
1218 | 1218 | ||
1219 | /* Call the bus-independant setup code */ | 1219 | /* Call the bus-independant setup code */ |