OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: wm8996: 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: Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-08 23:44:39 +01:00
parent f42b6f5800
commit c2aea142af
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/codecs/wm8996.c
View File

@ -17,6 +17,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/gcd.h> #include <linux/gcd.h>
#include <linux/gpio/driver.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/regmap.h> #include <linux/regmap.h>
@ -2139,14 +2140,9 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
} }
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
static inline struct wm8996_priv *gpio_to_wm8996(struct gpio_chip *chip)
{
return container_of(chip, struct wm8996_priv, gpio_chip);
}
static void wm8996_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void wm8996_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct wm8996_priv *wm8996 = gpio_to_wm8996(chip); struct wm8996_priv *wm8996 = gpiochip_get_data(chip);
regmap_update_bits(wm8996->regmap, WM8996_GPIO_1 + offset, regmap_update_bits(wm8996->regmap, WM8996_GPIO_1 + offset,
WM8996_GP1_LVL, !!value << WM8996_GP1_LVL_SHIFT); WM8996_GP1_LVL, !!value << WM8996_GP1_LVL_SHIFT);
@ -2155,7 +2151,7 @@ static void wm8996_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int wm8996_gpio_direction_out(struct gpio_chip *chip, static int wm8996_gpio_direction_out(struct gpio_chip *chip,
unsigned offset, int value) unsigned offset, int value)
{ {
struct wm8996_priv *wm8996 = gpio_to_wm8996(chip); struct wm8996_priv *wm8996 = gpiochip_get_data(chip);
int val; int val;
val = (1 << WM8996_GP1_FN_SHIFT) | (!!value << WM8996_GP1_LVL_SHIFT); val = (1 << WM8996_GP1_FN_SHIFT) | (!!value << WM8996_GP1_LVL_SHIFT);
@ -2167,7 +2163,7 @@ static int wm8996_gpio_direction_out(struct gpio_chip *chip,
static int wm8996_gpio_get(struct gpio_chip *chip, unsigned offset) static int wm8996_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct wm8996_priv *wm8996 = gpio_to_wm8996(chip); struct wm8996_priv *wm8996 = gpiochip_get_data(chip);
unsigned int reg; unsigned int reg;
int ret; int ret;
@ -2180,7 +2176,7 @@ static int wm8996_gpio_get(struct gpio_chip *chip, unsigned offset)
static int wm8996_gpio_direction_in(struct gpio_chip *chip, unsigned offset) static int wm8996_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
{ {
struct wm8996_priv *wm8996 = gpio_to_wm8996(chip); struct wm8996_priv *wm8996 = gpiochip_get_data(chip);
return regmap_update_bits(wm8996->regmap, WM8996_GPIO_1 + offset, return regmap_update_bits(wm8996->regmap, WM8996_GPIO_1 + offset,
WM8996_GP1_FN_MASK | WM8996_GP1_DIR, WM8996_GP1_FN_MASK | WM8996_GP1_DIR,
@ -2211,7 +2207,7 @@ static void wm8996_init_gpio(struct wm8996_priv *wm8996)
else else
wm8996->gpio_chip.base = -1; wm8996->gpio_chip.base = -1;
ret = gpiochip_add(&wm8996->gpio_chip); ret = gpiochip_add_data(&wm8996->gpio_chip, wm8996);
if (ret != 0) if (ret != 0)
dev_err(wm8996->dev, "Failed to add GPIOs: %d\n", ret); dev_err(wm8996->dev, "Failed to add GPIOs: %d\n", ret);
} }