ASoC: core: use PTR_ERR instead of PTR_RET
PATCH 1/1 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 <[email protected]>
--- sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/soc-core.c +4 -4
@@ -2153,28 +2153,28 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev, p =devm_pinctrl_get (dev);if (IS_ERR (p)) {dev_err (dev,"Failed to get pinctrl\n" ); -return PTR_RET (p); +return PTR_ERR (p); } cfg->pctl = p; state =pinctrl_lookup_state (p,"ac97-reset" );if (IS_ERR (state)) {dev_err (dev,"Can't find pinctrl state ac97-reset\n" ); -return PTR_RET (state); +return PTR_ERR (state); } cfg->pstate_reset = state; state =pinctrl_lookup_state (p,"ac97-warm-reset" );if (IS_ERR (state)) {dev_err (dev,"Can't find pinctrl state ac97-warm-reset\n" ); -return PTR_RET (state); +return PTR_ERR (state); } cfg->pstate_warm_reset = state; state =pinctrl_lookup_state (p,"ac97-running" );if (IS_ERR (state)) {dev_err (dev,"Can't find pinctrl state ac97-running\n" ); -return PTR_RET (state); +return PTR_ERR (state); } cfg->pstate_run = state;
Signature · 1 line
1.9.0
Quoted 3 lines · Christoph Jaeger
PTR_RETis deprecated.PTR_ERR_OR_ZEROshould be used instead. However, we already know thatIS_ERRis true, and thusPTR_ERR_OR_ZEROwould never yield zero, so we can usePTR_ERRhere.
Applied, thanks.