forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpio: 104-idio-16: 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().

Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-03 18:18:06 +01:00
parent 1f36bec53f
commit d602ae90a3
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpio/gpio-104-idio-16.c
View file

@ -72,14 +72,9 @@ static int idio_16_gpio_direction_output(struct gpio_chip *chip,
return 0; return 0;
} }
static struct idio_16_gpio *to_idio16gpio(struct gpio_chip *gc)
{
return container_of(gc, struct idio_16_gpio, chip);
}
static int idio_16_gpio_get(struct gpio_chip *chip, unsigned offset) static int idio_16_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
const unsigned mask = BIT(offset-16); const unsigned mask = BIT(offset-16);
if (offset < 16) if (offset < 16)
@ -93,7 +88,7 @@ static int idio_16_gpio_get(struct gpio_chip *chip, unsigned offset)
static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
const unsigned mask = BIT(offset); const unsigned mask = BIT(offset);
unsigned long flags; unsigned long flags;
@ -122,7 +117,7 @@ static void idio_16_irq_ack(struct irq_data *data)
static void idio_16_irq_mask(struct irq_data *data) static void idio_16_irq_mask(struct irq_data *data)
{ {
struct gpio_chip *chip = irq_data_get_irq_chip_data(data); struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
const unsigned long mask = BIT(irqd_to_hwirq(data)); const unsigned long mask = BIT(irqd_to_hwirq(data));
unsigned long flags; unsigned long flags;
@ -140,7 +135,7 @@ static void idio_16_irq_mask(struct irq_data *data)
static void idio_16_irq_unmask(struct irq_data *data) static void idio_16_irq_unmask(struct irq_data *data)
{ {
struct gpio_chip *chip = irq_data_get_irq_chip_data(data); struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = gpiochip_get_data(chip);
const unsigned long mask = BIT(irqd_to_hwirq(data)); const unsigned long mask = BIT(irqd_to_hwirq(data));
const unsigned long prev_irq_mask = idio16gpio->irq_mask; const unsigned long prev_irq_mask = idio16gpio->irq_mask;
unsigned long flags; unsigned long flags;
@ -232,7 +227,7 @@ static int __init idio_16_probe(struct platform_device *pdev)
dev_set_drvdata(dev, idio16gpio); dev_set_drvdata(dev, idio16gpio);
err = gpiochip_add(&idio16gpio->chip); err = gpiochip_add_data(&idio16gpio->chip, idio16gpio);
if (err) { if (err) {
dev_err(dev, "GPIO registering failed (%d)\n", err); dev_err(dev, "GPIO registering failed (%d)\n", err);
goto err_gpio_register; goto err_gpio_register;