kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gpio: mvebu: Use the proper APIs

Browse source 
The MVEBU driver is requesting GPIO descriptors from itself, which
is fine, but we have proper APIs to do this in a controlled way, so
stop calling into the private functions of the GPIO library and use
the gpiochip_* functions instead. Only include <linux/gpio/driver.h>
and <linux/gpio/consumer.h> since we are both producers and consumers
in this case.

Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2018-04-13 15:40:45 +02:00
parent 99ef32adc5
commit ba78d83be7
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpio/gpio-mvebu.c
View file

@ -36,7 +36,8 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio/driver.h>
#include <linux/gpio/consumer.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
@ -51,8 +52,6 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "gpiolib.h"
/* /*
* GPIO unit register offsets. * GPIO unit register offsets.
*/ */
@ -608,19 +607,16 @@ static int mvebu_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
if (mvpwm->gpiod) { if (mvpwm->gpiod) {
ret = -EBUSY; ret = -EBUSY;
} else { } else {
desc = gpio_to_desc(mvchip->chip.base + pwm->hwpwm); desc = gpiochip_request_own_desc(&mvchip->chip,
if (!desc) { pwm->hwpwm, "mvebu-pwm");
ret = -ENODEV; if (IS_ERR(desc)) {
ret = PTR_ERR(desc);
goto out; goto out;
} }
ret = gpiod_request(desc, "mvebu-pwm");
if (ret)
goto out;
ret = gpiod_direction_output(desc, 0); ret = gpiod_direction_output(desc, 0);
if (ret) { if (ret) {
gpiod_free(desc); gpiochip_free_own_desc(desc);
goto out; goto out;
} }
@ -637,7 +633,7 @@ static void mvebu_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&mvpwm->lock, flags); spin_lock_irqsave(&mvpwm->lock, flags);
gpiod_free(mvpwm->gpiod); gpiochip_free_own_desc(mvpwm->gpiod);
mvpwm->gpiod = NULL; mvpwm->gpiod = NULL;
spin_unlock_irqrestore(&mvpwm->lock, flags); spin_unlock_irqrestore(&mvpwm->lock, flags);
} }