ASoC: rt5677: use gpiochip data pointer

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: Bard Liao <bardliao@realtek.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index 33e290b703dfff7c421e4cd3b0d7d5e83c54efd0..60212266d5d17387ce4a179e9f6f60c5a9c6c617 100644 (file)
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4520,14 +4520,9 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_GPIOLIB
-static inline struct rt5677_priv *gpio_to_rt5677(struct gpio_chip *chip)
-{
-       return container_of(chip, struct rt5677_priv, gpio_chip);
-}
-
 static void rt5677_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct rt5677_priv *rt5677 = gpiochip_get_data(chip);
 
        switch (offset) {
        case RT5677_GPIO1 ... RT5677_GPIO5:
@@ -4548,7 +4543,7 @@ static void rt5677_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 static int rt5677_gpio_direction_out(struct gpio_chip *chip,
                                     unsigned offset, int value)
 {
-       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct rt5677_priv *rt5677 = gpiochip_get_data(chip);
 
        switch (offset) {
        case RT5677_GPIO1 ... RT5677_GPIO5:
@@ -4572,7 +4567,7 @@ static int rt5677_gpio_direction_out(struct gpio_chip *chip,
 
 static int rt5677_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct rt5677_priv *rt5677 = gpiochip_get_data(chip);
        int value, ret;
 
        ret = regmap_read(rt5677->regmap, RT5677_GPIO_ST, &value);
@@ -4584,7 +4579,7 @@ static int rt5677_gpio_get(struct gpio_chip *chip, unsigned offset)
 
 static int rt5677_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
-       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct rt5677_priv *rt5677 = gpiochip_get_data(chip);
 
        switch (offset) {
        case RT5677_GPIO1 ... RT5677_GPIO5:
@@ -4638,7 +4633,7 @@ static void rt5677_gpio_config(struct rt5677_priv *rt5677, unsigned offset,
 
 static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-       struct rt5677_priv *rt5677 = gpio_to_rt5677(chip);
+       struct rt5677_priv *rt5677 = gpiochip_get_data(chip);
        struct regmap_irq_chip_data *data = rt5677->irq_data;
        int irq;
 
@@ -4697,7 +4692,7 @@ static void rt5677_init_gpio(struct i2c_client *i2c)
        rt5677->gpio_chip.parent = &i2c->dev;
        rt5677->gpio_chip.base = -1;
 
-       ret = gpiochip_add(&rt5677->gpio_chip);
+       ret = gpiochip_add_data(&rt5677->gpio_chip, rt5677);
        if (ret != 0)
                dev_err(&i2c->dev, "Failed to add GPIOs: %d\n", ret);
 }