leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: adnp: 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().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-04 14:56:15 +01:00
parent b2afc6f352
commit 1e69c4fe2a
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpio/gpio-adnp.c
View File

@ -36,11 +36,6 @@ struct adnp {
u8 *irq_low; u8 *irq_low;
}; };
static inline struct adnp *to_adnp(struct gpio_chip *chip)
{
return container_of(chip, struct adnp, gpio);
}
static int adnp_read(struct adnp *adnp, unsigned offset, uint8_t *value) static int adnp_read(struct adnp *adnp, unsigned offset, uint8_t *value)
{ {
int err; int err;
@ -72,7 +67,7 @@ static int adnp_write(struct adnp *adnp, unsigned offset, uint8_t value)
static int adnp_gpio_get(struct gpio_chip *chip, unsigned offset) static int adnp_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct adnp *adnp = to_adnp(chip); struct adnp *adnp = gpiochip_get_data(chip);
unsigned int reg = offset >> adnp->reg_shift; unsigned int reg = offset >> adnp->reg_shift;
unsigned int pos = offset & 7; unsigned int pos = offset & 7;
u8 value; u8 value;
@ -106,7 +101,7 @@ static void __adnp_gpio_set(struct adnp *adnp, unsigned offset, int value)
static void adnp_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void adnp_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct adnp *adnp = to_adnp(chip); struct adnp *adnp = gpiochip_get_data(chip);
mutex_lock(&adnp->i2c_lock); mutex_lock(&adnp->i2c_lock);
__adnp_gpio_set(adnp, offset, value); __adnp_gpio_set(adnp, offset, value);
@ -115,7 +110,7 @@ static void adnp_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset) static int adnp_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
{ {
struct adnp *adnp = to_adnp(chip); struct adnp *adnp = gpiochip_get_data(chip);
unsigned int reg = offset >> adnp->reg_shift; unsigned int reg = offset >> adnp->reg_shift;
unsigned int pos = offset & 7; unsigned int pos = offset & 7;
u8 value; u8 value;
@ -150,7 +145,7 @@ out:
static int adnp_gpio_direction_output(struct gpio_chip *chip, unsigned offset, static int adnp_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
int value) int value)
{ {
struct adnp *adnp = to_adnp(chip); struct adnp *adnp = gpiochip_get_data(chip);
unsigned int reg = offset >> adnp->reg_shift; unsigned int reg = offset >> adnp->reg_shift;
unsigned int pos = offset & 7; unsigned int pos = offset & 7;
int err; int err;
@ -187,7 +182,7 @@ out:
static void adnp_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) static void adnp_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
{ {
struct adnp *adnp = to_adnp(chip); struct adnp *adnp = gpiochip_get_data(chip);
unsigned int num_regs = 1 << adnp->reg_shift, i, j; unsigned int num_regs = 1 << adnp->reg_shift, i, j;
int err; int err;
@ -270,7 +265,7 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios)
chip->of_node = chip->parent->of_node; chip->of_node = chip->parent->of_node;
chip->owner = THIS_MODULE; chip->owner = THIS_MODULE;
err = gpiochip_add(chip); err = gpiochip_add_data(chip, adnp);
if (err) if (err)
return err; return err;
@ -340,7 +335,7 @@ static irqreturn_t adnp_irq(int irq, void *data)
static void adnp_irq_mask(struct irq_data *d) static void adnp_irq_mask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct adnp *adnp = to_adnp(gc); struct adnp *adnp = gpiochip_get_data(gc);
unsigned int reg = d->hwirq >> adnp->reg_shift; unsigned int reg = d->hwirq >> adnp->reg_shift;
unsigned int pos = d->hwirq & 7; unsigned int pos = d->hwirq & 7;
@ -350,7 +345,7 @@ static void adnp_irq_mask(struct irq_data *d)
static void adnp_irq_unmask(struct irq_data *d) static void adnp_irq_unmask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct adnp *adnp = to_adnp(gc); struct adnp *adnp = gpiochip_get_data(gc);
unsigned int reg = d->hwirq >> adnp->reg_shift; unsigned int reg = d->hwirq >> adnp->reg_shift;
unsigned int pos = d->hwirq & 7; unsigned int pos = d->hwirq & 7;
@ -360,7 +355,7 @@ static void adnp_irq_unmask(struct irq_data *d)
static int adnp_irq_set_type(struct irq_data *d, unsigned int type) static int adnp_irq_set_type(struct irq_data *d, unsigned int type)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct adnp *adnp = to_adnp(gc); struct adnp *adnp = gpiochip_get_data(gc);
unsigned int reg = d->hwirq >> adnp->reg_shift; unsigned int reg = d->hwirq >> adnp->reg_shift;
unsigned int pos = d->hwirq & 7; unsigned int pos = d->hwirq & 7;
@ -390,7 +385,7 @@ static int adnp_irq_set_type(struct irq_data *d, unsigned int type)
static void adnp_irq_bus_lock(struct irq_data *d) static void adnp_irq_bus_lock(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct adnp *adnp = to_adnp(gc); struct adnp *adnp = gpiochip_get_data(gc);
mutex_lock(&adnp->irq_lock); mutex_lock(&adnp->irq_lock);
} }
@ -398,7 +393,7 @@ static void adnp_irq_bus_lock(struct irq_data *d)
static void adnp_irq_bus_unlock(struct irq_data *d) static void adnp_irq_bus_unlock(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct adnp *adnp = to_adnp(gc); struct adnp *adnp = gpiochip_get_data(gc);
unsigned int num_regs = 1 << adnp->reg_shift, i; unsigned int num_regs = 1 << adnp->reg_shift, i;
mutex_lock(&adnp->i2c_lock); mutex_lock(&adnp->i2c_lock);