diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-15 11:20:32 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-15 11:25:01 +0930 |
| commit | 8c6ffba0eddc8c110dbf444f51354ce42069abfc (patch) | |
| tree | 1055a1cfdf7bd79d6e2c4b969d412780ff2d2209 /drivers/spi | |
| parent | 6e8b8726ad503214ba66e34aed69aff41de33489 (diff) | |
| download | blackbird-op-linux-8c6ffba0eddc8c110dbf444f51354ce42069abfc.tar.gz blackbird-op-linux-8c6ffba0eddc8c110dbf444f51354ce42069abfc.zip | |
PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.
Sweep of the simple cases.
Cc: netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-fsl-spi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spidev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index 41e89c3e3edc..ca0ddb8cef5c 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c @@ -901,7 +901,7 @@ static int plat_mpc8xxx_spi_probe(struct platform_device *pdev) return -EINVAL; master = fsl_spi_probe(&pdev->dev, mem, irq); - return PTR_RET(master); + return PTR_ERR_OR_ZERO(master); } static int plat_mpc8xxx_spi_remove(struct platform_device *pdev) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 911e9e0711d2..ca5bcfe874d0 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -603,7 +603,7 @@ static int spidev_probe(struct spi_device *spi) dev = device_create(spidev_class, &spi->dev, spidev->devt, spidev, "spidev%d.%d", spi->master->bus_num, spi->chip_select); - status = PTR_RET(dev); + status = PTR_ERR_OR_ZERO(dev); } else { dev_dbg(&spi->dev, "no minor number available!\n"); status = -ENODEV; |
