diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-09-17 08:58:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-17 12:49:53 -0400 |
commit | 5d5e63af998026f0340d1081fb15ad3c26d80c81 (patch) | |
tree | 4f5cdc80a2611d8f19761a946a0adfc9404053b5 | |
parent | 44caf7648064502fd1d37d18443ae92c064ebadd (diff) |
ASoC: Remove return value checking for gpiochip_remove()
gpiochip_remove() will return void eventually.
Thus this patch removes return value checking for gpiochip_remove().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/rt5677.c | 5 | ||||
-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 |
5 files changed, 5 insertions, 22 deletions
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 02bc8bd7caeb..991409f90fd3 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c | |||
@@ -3274,11 +3274,8 @@ static void rt5677_init_gpio(struct i2c_client *i2c) | |||
3274 | static void rt5677_free_gpio(struct i2c_client *i2c) | 3274 | static void rt5677_free_gpio(struct i2c_client *i2c) |
3275 | { | 3275 | { |
3276 | struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); | 3276 | struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); |
3277 | int ret; | ||
3278 | 3277 | ||
3279 | ret = gpiochip_remove(&rt5677->gpio_chip); | 3278 | gpiochip_remove(&rt5677->gpio_chip); |
3280 | if (ret != 0) | ||
3281 | dev_err(&i2c->dev, "Failed to remove GPIOs: %d\n", ret); | ||
3282 | } | 3279 | } |
3283 | #else | 3280 | #else |
3284 | static void rt5677_init_gpio(struct i2c_client *i2c) | 3281 | static void rt5677_init_gpio(struct i2c_client *i2c) |
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) |