| Message ID | 20200210092423.327499-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f4d95de415b286090c1bf739c20a5ea2aefda834 |
| Headers | show |
| Series | [V2] ASoC: ti: davinci-mcasp: remove redundant assignment to variable ret | expand |
On 10/02/2020 11.24, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The assignment to ret is redundant as it is not used in the error > return path and hence can be removed. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Addresses-Coverity: ("Unused value") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > V2: explicitly return NULL to improve readability. Thanks to Dan Carpenter for > suggesting this improvement. > --- > sound/soc/ti/davinci-mcasp.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c > index e1e937eb1dc1..6f97639c46cd 100644 > --- a/sound/soc/ti/davinci-mcasp.c > +++ b/sound/soc/ti/davinci-mcasp.c > @@ -1764,10 +1764,8 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( > } else if (match) { > pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata), > GFP_KERNEL); > - if (!pdata) { > - ret = -ENOMEM; > - return pdata; > - } > + if (!pdata) > + return NULL; > } else { > /* control shouldn't reach here. something is wrong */ > ret = -EINVAL; > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index e1e937eb1dc1..6f97639c46cd 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1764,10 +1764,8 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( } else if (match) { pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - ret = -ENOMEM; - return pdata; - } + if (!pdata) + return NULL; } else { /* control shouldn't reach here. something is wrong */ ret = -EINVAL;