diff options
Diffstat (limited to 'drivers/spi/spi-bcm2835aux.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835aux.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index bb57035c5770..a2162ff56a12 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -491,7 +491,6 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)  {  	struct spi_master *master;  	struct bcm2835aux_spi *bs; -	struct resource *res;  	unsigned long clk_hz;  	int err; @@ -524,8 +523,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)  	bs = spi_master_get_devdata(master);  	/* the main area */ -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	bs->regs = devm_ioremap_resource(&pdev->dev, res); +	bs->regs = devm_platform_ioremap_resource(pdev, 0);  	if (IS_ERR(bs->regs)) {  		err = PTR_ERR(bs->regs);  		goto out_master_put; @@ -540,7 +538,6 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)  	bs->irq = platform_get_irq(pdev, 0);  	if (bs->irq <= 0) { -		dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq);  		err = bs->irq ? bs->irq : -ENODEV;  		goto out_master_put;  	}  |