diff options
author | abdoulaye berthe <berthe.ab@gmail.com> | 2014-07-12 16:30:14 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-18 14:03:10 -0400 |
commit | 88d5e520aa9701eb3e4f46165e02097cc03d363a (patch) | |
tree | 443b8f89eeaf8933a9d3af2c9928cf0008aa35fd /sound | |
parent | 2134cb997f2f1b2d960ad8705d67dc8d690ba59c (diff) |
driver:gpio remove all usage of gpio_remove retval in driver
this remove all reference to gpio_remove retval in all driver
except pinctrl and gpio. the same thing is done for gpio and
pinctrl in two different patches.
Signed-off-by: Abdoulaye Berthe <berthe.ab@gmail.com>
Acked-by: Michael Büsch <m@bues.ch>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm5100.c | 5 | ||||
-rw-r--r-- | sound/soc/codecs/wm8903.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/wm8962.c | 5 | ||||
-rw-r--r-- | sound/soc/codecs/wm8996.c | 6 |
4 files changed, 4 insertions, 18 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index 7bb0d36d4c54..a01ad629ed61 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c | |||
@@ -2319,11 +2319,8 @@ static void wm5100_init_gpio(struct i2c_client *i2c) | |||
2319 | static void wm5100_free_gpio(struct i2c_client *i2c) | 2319 | static void wm5100_free_gpio(struct i2c_client *i2c) |
2320 | { | 2320 | { |
2321 | struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); | 2321 | struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c); |
2322 | int ret; | ||
2323 | 2322 | ||
2324 | ret = gpiochip_remove(&wm5100->gpio_chip); | 2323 | gpiochip_remove(&wm5100->gpio_chip); |
2325 | if (ret != 0) | ||
2326 | dev_err(&i2c->dev, "Failed to remove GPIOs: %d\n", ret); | ||
2327 | } | 2324 | } |
2328 | #else | 2325 | #else |
2329 | static void wm5100_init_gpio(struct i2c_client *i2c) | 2326 | static void wm5100_init_gpio(struct i2c_client *i2c) |
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index aa0984864e76..c038b3e04398 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -1877,11 +1877,7 @@ static void wm8903_init_gpio(struct wm8903_priv *wm8903) | |||
1877 | 1877 | ||
1878 | static void wm8903_free_gpio(struct wm8903_priv *wm8903) | 1878 | static void wm8903_free_gpio(struct wm8903_priv *wm8903) |
1879 | { | 1879 | { |
1880 | int ret; | 1880 | gpiochip_remove(&wm8903->gpio_chip); |
1881 | |||
1882 | ret = gpiochip_remove(&wm8903->gpio_chip); | ||
1883 | if (ret != 0) | ||
1884 | dev_err(wm8903->dev, "Failed to remove GPIOs: %d\n", ret); | ||
1885 | } | 1881 | } |
1886 | #else | 1882 | #else |
1887 | static void wm8903_init_gpio(struct wm8903_priv *wm8903) | 1883 | static void wm8903_init_gpio(struct wm8903_priv *wm8903) |
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 1098ae32f1f9..9077411e62ce 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
@@ -3398,11 +3398,8 @@ static void wm8962_init_gpio(struct snd_soc_codec *codec) | |||
3398 | static void wm8962_free_gpio(struct snd_soc_codec *codec) | 3398 | static void wm8962_free_gpio(struct snd_soc_codec *codec) |
3399 | { | 3399 | { |
3400 | struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); | 3400 | struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); |
3401 | int ret; | ||
3402 | 3401 | ||
3403 | ret = gpiochip_remove(&wm8962->gpio_chip); | 3402 | gpiochip_remove(&wm8962->gpio_chip); |
3404 | if (ret != 0) | ||
3405 | dev_err(codec->dev, "Failed to remove GPIOs: %d\n", ret); | ||
3406 | } | 3403 | } |
3407 | #else | 3404 | #else |
3408 | static void wm8962_init_gpio(struct snd_soc_codec *codec) | 3405 | static void wm8962_init_gpio(struct snd_soc_codec *codec) |
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index f16ff4f56923..b1dcc11c1b23 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c | |||
@@ -2216,11 +2216,7 @@ static void wm8996_init_gpio(struct wm8996_priv *wm8996) | |||
2216 | 2216 | ||
2217 | static void wm8996_free_gpio(struct wm8996_priv *wm8996) | 2217 | static void wm8996_free_gpio(struct wm8996_priv *wm8996) |
2218 | { | 2218 | { |
2219 | int ret; | 2219 | gpiochip_remove(&wm8996->gpio_chip); |
2220 | |||
2221 | ret = gpiochip_remove(&wm8996->gpio_chip); | ||
2222 | if (ret != 0) | ||
2223 | dev_err(wm8996->dev, "Failed to remove GPIOs: %d\n", ret); | ||
2224 | } | 2220 | } |
2225 | #else | 2221 | #else |
2226 | static void wm8996_init_gpio(struct wm8996_priv *wm8996) | 2222 | static void wm8996_init_gpio(struct wm8996_priv *wm8996) |