aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2016-02-22 07:16:51 -0500
committerLinus Walleij <linus.walleij@linaro.org>2016-02-25 08:16:57 -0500
commitea1361fd5f26f1dbb369f85b3ad42a84c133e7e1 (patch)
treeaf03c5621bc6f90f853e2f91b950bd6a74e22eda
parent67ebb742b9303a53d62e0cac2939e7e70846412c (diff)
gpio: pisosr: Use devm_gpiod_get_optional for gpio->load_gpio
gpio->load_gpio is optional, so use devm_gpiod_get_optional instead. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-pisosr.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-pisosr.c b/drivers/gpio/gpio-pisosr.c
index f9f1074744ab..8b8bf8f9de6a 100644
--- a/drivers/gpio/gpio-pisosr.c
+++ b/drivers/gpio/gpio-pisosr.c
@@ -125,15 +125,12 @@ static int pisosr_gpio_probe(struct spi_device *spi)
125 if (!gpio->buffer) 125 if (!gpio->buffer)
126 return -ENOMEM; 126 return -ENOMEM;
127 127
128 gpio->load_gpio = devm_gpiod_get(dev, "load", GPIOD_OUT_LOW); 128 gpio->load_gpio = devm_gpiod_get_optional(dev, "load", GPIOD_OUT_LOW);
129 if (IS_ERR(gpio->load_gpio)) { 129 if (IS_ERR(gpio->load_gpio)) {
130 ret = PTR_ERR(gpio->load_gpio); 130 ret = PTR_ERR(gpio->load_gpio);
131 if (ret != -ENOENT && ret != -ENOSYS) { 131 if (ret != -EPROBE_DEFER)
132 if (ret != -EPROBE_DEFER) 132 dev_err(dev, "Unable to allocate load GPIO\n");
133 dev_err(dev, "Unable to allocate load GPIO\n"); 133 return ret;
134 return ret;
135 }
136 gpio->load_gpio = NULL;
137 } 134 }
138 135
139 mutex_init(&gpio->lock); 136 mutex_init(&gpio->lock);