diff options
author | Christoph Jaeger <christophjaeger@linux.com> | 2014-04-15 16:39:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-18 12:12:35 -0400 |
commit | b7580cde704920da69e50d133cea16eca77ff3bd (patch) | |
tree | 21af14dc53f6681fd7737d8cb9b5238ad53cc8a2 | |
parent | aa0258adf6078a41a3db06f4e498253aff64d151 (diff) |
ASoC: core: use PTR_ERR instead of PTR_RET
PTR_RET is deprecated. PTR_ERR_OR_ZERO should be used instead. However,
we already know that IS_ERR is true, and thus PTR_ERR_OR_ZERO would
never yield zero, so we can use PTR_ERR here.
Signed-off-by: Christoph Jaeger <christophjaeger@linux.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 78f0c51c6c83..7f8efea5c5b1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -2075,28 +2075,28 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev, | |||
2075 | p = devm_pinctrl_get(dev); | 2075 | p = devm_pinctrl_get(dev); |
2076 | if (IS_ERR(p)) { | 2076 | if (IS_ERR(p)) { |
2077 | dev_err(dev, "Failed to get pinctrl\n"); | 2077 | dev_err(dev, "Failed to get pinctrl\n"); |
2078 | return PTR_RET(p); | 2078 | return PTR_ERR(p); |
2079 | } | 2079 | } |
2080 | cfg->pctl = p; | 2080 | cfg->pctl = p; |
2081 | 2081 | ||
2082 | state = pinctrl_lookup_state(p, "ac97-reset"); | 2082 | state = pinctrl_lookup_state(p, "ac97-reset"); |
2083 | if (IS_ERR(state)) { | 2083 | if (IS_ERR(state)) { |
2084 | dev_err(dev, "Can't find pinctrl state ac97-reset\n"); | 2084 | dev_err(dev, "Can't find pinctrl state ac97-reset\n"); |
2085 | return PTR_RET(state); | 2085 | return PTR_ERR(state); |
2086 | } | 2086 | } |
2087 | cfg->pstate_reset = state; | 2087 | cfg->pstate_reset = state; |
2088 | 2088 | ||
2089 | state = pinctrl_lookup_state(p, "ac97-warm-reset"); | 2089 | state = pinctrl_lookup_state(p, "ac97-warm-reset"); |
2090 | if (IS_ERR(state)) { | 2090 | if (IS_ERR(state)) { |
2091 | dev_err(dev, "Can't find pinctrl state ac97-warm-reset\n"); | 2091 | dev_err(dev, "Can't find pinctrl state ac97-warm-reset\n"); |
2092 | return PTR_RET(state); | 2092 | return PTR_ERR(state); |
2093 | } | 2093 | } |
2094 | cfg->pstate_warm_reset = state; | 2094 | cfg->pstate_warm_reset = state; |
2095 | 2095 | ||
2096 | state = pinctrl_lookup_state(p, "ac97-running"); | 2096 | state = pinctrl_lookup_state(p, "ac97-running"); |
2097 | if (IS_ERR(state)) { | 2097 | if (IS_ERR(state)) { |
2098 | dev_err(dev, "Can't find pinctrl state ac97-running\n"); | 2098 | dev_err(dev, "Can't find pinctrl state ac97-running\n"); |
2099 | return PTR_RET(state); | 2099 | return PTR_ERR(state); |
2100 | } | 2100 | } |
2101 | cfg->pstate_run = state; | 2101 | cfg->pstate_run = state; |
2102 | 2102 | ||