diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:48:24 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:48:24 -0400 |
commit | bf6a67ee3427ab142136e03e90d0b67ecbca5ff2 (patch) | |
tree | 0b3f63fa323a8bfd6e513fac7c5f74ad4a9410b9 /drivers/spi | |
parent | b1e50ebcf24668e57f058deb48b0704b5391ed0f (diff) |
spi/xilinx: Fix compile error
Commit 58f9b0b02414062eaff46716bc04b47d7e79add5, "of: eliminate
of_device->node and dev_archdata->{of,prom}_node" changed the location
of the device_node pointer. Most drivers were converted to the new
location, but the xilinx_spi_of driver was missed and now fails to
compile.
This patch fixes up the xilinx_spi_of driver to use the new location.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/xilinx_spi_of.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c index 55c58012a028..4654805b08d8 100644 --- a/drivers/spi/xilinx_spi_of.c +++ b/drivers/spi/xilinx_spi_of.c | |||
@@ -48,13 +48,13 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, | |||
48 | const u32 *prop; | 48 | const u32 *prop; |
49 | int len; | 49 | int len; |
50 | 50 | ||
51 | rc = of_address_to_resource(ofdev->node, 0, &r_mem); | 51 | rc = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem); |
52 | if (rc) { | 52 | if (rc) { |
53 | dev_warn(&ofdev->dev, "invalid address\n"); | 53 | dev_warn(&ofdev->dev, "invalid address\n"); |
54 | return rc; | 54 | return rc; |
55 | } | 55 | } |
56 | 56 | ||
57 | rc = of_irq_to_resource(ofdev->node, 0, &r_irq); | 57 | rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq); |
58 | if (rc == NO_IRQ) { | 58 | if (rc == NO_IRQ) { |
59 | dev_warn(&ofdev->dev, "no IRQ found\n"); | 59 | dev_warn(&ofdev->dev, "no IRQ found\n"); |
60 | return -ENODEV; | 60 | return -ENODEV; |
@@ -67,7 +67,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, | |||
67 | return -ENOMEM; | 67 | return -ENOMEM; |
68 | 68 | ||
69 | /* number of slave select bits is required */ | 69 | /* number of slave select bits is required */ |
70 | prop = of_get_property(ofdev->node, "xlnx,num-ss-bits", &len); | 70 | prop = of_get_property(ofdev->dev.of_node, "xlnx,num-ss-bits", &len); |
71 | if (!prop || len < sizeof(*prop)) { | 71 | if (!prop || len < sizeof(*prop)) { |
72 | dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n"); | 72 | dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n"); |
73 | return -EINVAL; | 73 | return -EINVAL; |
@@ -81,7 +81,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, | |||
81 | dev_set_drvdata(&ofdev->dev, master); | 81 | dev_set_drvdata(&ofdev->dev, master); |
82 | 82 | ||
83 | /* Add any subnodes on the SPI bus */ | 83 | /* Add any subnodes on the SPI bus */ |
84 | of_register_spi_devices(master, ofdev->node); | 84 | of_register_spi_devices(master, ofdev->dev.of_node); |
85 | 85 | ||
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |