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/input/serio/xilinx_ps2.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/input/serio/xilinx_ps2.c')
-rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index f84f8e32e3f1..7a288c0ef1a6 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
@@ -244,17 +244,17 @@ static int __devinit xps2_of_probe(struct of_device *ofdev, | |||
244 | int error; | 244 | int error; |
245 | 245 | ||
246 | dev_info(dev, "Device Tree Probing \'%s\'\n", | 246 | dev_info(dev, "Device Tree Probing \'%s\'\n", |
247 | ofdev->node->name); | 247 | ofdev->dev.of_node->name); |
248 | 248 | ||
249 | /* Get iospace for the device */ | 249 | /* Get iospace for the device */ |
250 | error = of_address_to_resource(ofdev->node, 0, &r_mem); | 250 | error = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem); |
251 | if (error) { | 251 | if (error) { |
252 | dev_err(dev, "invalid address\n"); | 252 | dev_err(dev, "invalid address\n"); |
253 | return error; | 253 | return error; |
254 | } | 254 | } |
255 | 255 | ||
256 | /* Get IRQ for the device */ | 256 | /* Get IRQ for the device */ |
257 | if (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) { | 257 | if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) { |
258 | dev_err(dev, "no IRQ found\n"); | 258 | dev_err(dev, "no IRQ found\n"); |
259 | return -ENODEV; | 259 | return -ENODEV; |
260 | } | 260 | } |
@@ -342,7 +342,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev) | |||
342 | iounmap(drvdata->base_address); | 342 | iounmap(drvdata->base_address); |
343 | 343 | ||
344 | /* Get iospace of the device */ | 344 | /* Get iospace of the device */ |
345 | if (of_address_to_resource(of_dev->node, 0, &r_mem)) | 345 | if (of_address_to_resource(of_dev->dev.of_node, 0, &r_mem)) |
346 | dev_err(dev, "invalid address\n"); | 346 | dev_err(dev, "invalid address\n"); |
347 | else | 347 | else |
348 | release_mem_region(r_mem.start, resource_size(&r_mem)); | 348 | release_mem_region(r_mem.start, resource_size(&r_mem)); |