iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: zevio: use gpiochip data pointer

Browse Source 
This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: Fabian Vogt <fabian@ritter-vogt.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 15:26:02 +01:00
parent e730a5953a
commit 9a3ad668a0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpio/gpio-zevio.c
View File

@ -52,9 +52,6 @@
#define ZEVIO_GPIO_INPUT 0x18 #define ZEVIO_GPIO_INPUT 0x18
#define ZEVIO_GPIO_INT_STICKY 0x20 #define ZEVIO_GPIO_INT_STICKY 0x20
#define to_zevio_gpio(chip) container_of(to_of_mm_gpio_chip(chip), \
struct zevio_gpio, chip)
/* Bit number of GPIO in its section */ /* Bit number of GPIO in its section */
#define ZEVIO_GPIO_BIT(gpio) (gpio&7) #define ZEVIO_GPIO_BIT(gpio) (gpio&7)
@ -80,7 +77,7 @@ static inline void zevio_gpio_port_set(struct zevio_gpio *c, unsigned pin,
/* Functions for struct gpio_chip */ /* Functions for struct gpio_chip */
static int zevio_gpio_get(struct gpio_chip *chip, unsigned pin) static int zevio_gpio_get(struct gpio_chip *chip, unsigned pin)
{ {
struct zevio_gpio *controller = to_zevio_gpio(chip); struct zevio_gpio *controller = gpiochip_get_data(chip);
u32 val, dir; u32 val, dir;
spin_lock(&controller->lock); spin_lock(&controller->lock);
@ -96,7 +93,7 @@ static int zevio_gpio_get(struct gpio_chip *chip, unsigned pin)
static void zevio_gpio_set(struct gpio_chip *chip, unsigned pin, int value) static void zevio_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
{ {
struct zevio_gpio *controller = to_zevio_gpio(chip); struct zevio_gpio *controller = gpiochip_get_data(chip);
u32 val; u32 val;
spin_lock(&controller->lock); spin_lock(&controller->lock);
@ -112,7 +109,7 @@ static void zevio_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
static int zevio_gpio_direction_input(struct gpio_chip *chip, unsigned pin) static int zevio_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
{ {
struct zevio_gpio *controller = to_zevio_gpio(chip); struct zevio_gpio *controller = gpiochip_get_data(chip);
u32 val; u32 val;
spin_lock(&controller->lock); spin_lock(&controller->lock);
@ -129,7 +126,7 @@ static int zevio_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
static int zevio_gpio_direction_output(struct gpio_chip *chip, static int zevio_gpio_direction_output(struct gpio_chip *chip,
unsigned pin, int value) unsigned pin, int value)
{ {
struct zevio_gpio *controller = to_zevio_gpio(chip); struct zevio_gpio *controller = gpiochip_get_data(chip);
u32 val; u32 val;
spin_lock(&controller->lock); spin_lock(&controller->lock);
@ -187,7 +184,9 @@ static int zevio_gpio_probe(struct platform_device *pdev)
controller->chip.gc = zevio_gpio_chip; controller->chip.gc = zevio_gpio_chip;
controller->chip.gc.parent = &pdev->dev; controller->chip.gc.parent = &pdev->dev;
status = of_mm_gpiochip_add(pdev->dev.of_node, &(controller->chip)); status = of_mm_gpiochip_add_data(pdev->dev.of_node,
&(controller->chip),
controller);
if (status) { if (status) {
dev_err(&pdev->dev, "failed to add gpiochip: %d\n", status); dev_err(&pdev->dev, "failed to add gpiochip: %d\n", status);
return status; return status;