spi: at91-usart: Use PTR_ERR_OR_ZERO() to simplify code

[linux.git] / drivers / spi / spi-at91-usart.c

diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 7854d9790fe945c60a35f7f64b7bdd08a3482c6c..b11d0f993cc761751bbd1b270b798afcd042da4a 100644 (file)
--- a/drivers/spi/spi-at91-usart.c
+++ b/drivers/spi/spi-at91-usart.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

-#include <linux/of_platform.h>

 #include <linux/gpio/consumer.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>


@@ -486,10 +485,7 @@ static int at91_usart_gpio_setup(struct platform_device *pdev)
 
        cs_gpios = devm_gpiod_get_array_optional(&pdev->dev, "cs", GPIOD_OUT_LOW);
 
 
        cs_gpios = devm_gpiod_get_array_optional(&pdev->dev, "cs", GPIOD_OUT_LOW);
 

-       if (IS_ERR(cs_gpios))
-               return PTR_ERR(cs_gpios);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(cs_gpios);

 }
 
 static int at91_usart_spi_probe(struct platform_device *pdev)
 }
 
 static int at91_usart_spi_probe(struct platform_device *pdev)


@@ -527,7 +523,7 @@ static int at91_usart_spi_probe(struct platform_device *pdev)
        controller->dev.of_node = pdev->dev.parent->of_node;
        controller->bits_per_word_mask = SPI_BPW_MASK(8);
        controller->setup = at91_usart_spi_setup;
        controller->dev.of_node = pdev->dev.parent->of_node;
        controller->bits_per_word_mask = SPI_BPW_MASK(8);
        controller->setup = at91_usart_spi_setup;

-       controller->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;
+       controller->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;

        controller->transfer_one = at91_usart_spi_transfer_one;
        controller->prepare_message = at91_usart_spi_prepare_message;
        controller->unprepare_message = at91_usart_spi_unprepare_message;
        controller->transfer_one = at91_usart_spi_transfer_one;
        controller->prepare_message = at91_usart_spi_prepare_message;
        controller->unprepare_message = at91_usart_spi_unprepare_message;