Commit bf6a67ee authored by Grant Likely's avatar Grant Likely

spi/xilinx: Fix compile error

Commit 58f9b0b0, "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: default avatarGrant Likely <grant.likely@secretlab.ca>
parent b1e50ebc
...@@ -48,13 +48,13 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, ...@@ -48,13 +48,13 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev,
const u32 *prop; const u32 *prop;
int len; int len;
rc = of_address_to_resource(ofdev->node, 0, &r_mem); rc = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
if (rc) { if (rc) {
dev_warn(&ofdev->dev, "invalid address\n"); dev_warn(&ofdev->dev, "invalid address\n");
return rc; return rc;
} }
rc = of_irq_to_resource(ofdev->node, 0, &r_irq); rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);
if (rc == NO_IRQ) { if (rc == NO_IRQ) {
dev_warn(&ofdev->dev, "no IRQ found\n"); dev_warn(&ofdev->dev, "no IRQ found\n");
return -ENODEV; return -ENODEV;
...@@ -67,7 +67,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, ...@@ -67,7 +67,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev,
return -ENOMEM; return -ENOMEM;
/* number of slave select bits is required */ /* number of slave select bits is required */
prop = of_get_property(ofdev->node, "xlnx,num-ss-bits", &len); prop = of_get_property(ofdev->dev.of_node, "xlnx,num-ss-bits", &len);
if (!prop || len < sizeof(*prop)) { if (!prop || len < sizeof(*prop)) {
dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n"); dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n");
return -EINVAL; return -EINVAL;
...@@ -81,7 +81,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev, ...@@ -81,7 +81,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev,
dev_set_drvdata(&ofdev->dev, master); dev_set_drvdata(&ofdev->dev, master);
/* Add any subnodes on the SPI bus */ /* Add any subnodes on the SPI bus */
of_register_spi_devices(master, ofdev->node); of_register_spi_devices(master, ofdev->dev.of_node);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment