diff options
Diffstat (limited to 'drivers/spi/xilinx_spi_of.c')
| -rw-r--r-- | drivers/spi/xilinx_spi_of.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c index 748d33a76d29..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,  	const u32 *prop;  	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) {  		dev_warn(&ofdev->dev, "invalid address\n");  		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) {  		dev_warn(&ofdev->dev, "no IRQ found\n");  		return -ENODEV; @@ -67,7 +67,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev,  		return -ENOMEM;  	/* 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)) {  		dev_warn(&ofdev->dev, "no 'xlnx,num-ss-bits' property\n");  		return -EINVAL; @@ -81,7 +81,7 @@ static int __devinit xilinx_spi_of_probe(struct of_device *ofdev,  	dev_set_drvdata(&ofdev->dev, master);  	/* 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;  } @@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {  MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);  static struct of_platform_driver xilinx_spi_of_driver = { -	.match_table = xilinx_spi_of_match,  	.probe = xilinx_spi_of_probe,  	.remove = __exit_p(xilinx_spi_of_remove),  	.driver = {  		.name = "xilinx-xps-spi",  		.owner = THIS_MODULE, +		.of_match_table = xilinx_spi_of_match,  	},  };  |