| Message ID | d6ca1c55-1bb9-7ec2-de4a-63b994567d59@users.sourceforge.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 14a07f1d8c4c64af29566316df0415052e8bdfe4 |
| Headers | show |
On 23 November 2017 20:05, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Thu, 23 Nov 2017 20:42:20 +0100 > > Omit extra messages for a memory allocation failure in this function. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > --- > sound/soc/codecs/da7218.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c > index 56564ce90cb6..25ab7443d803 100644 > --- a/sound/soc/codecs/da7218.c > +++ b/sound/soc/codecs/da7218.c > @@ -2455,10 +2455,8 @@ static struct da7218_pdata *da7218_of_to_pdata(struct > snd_soc_codec *codec) > u32 of_val32; > > pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); > - if (!pdata) { > - dev_warn(codec->dev, "Failed to allocate memory for pdata\n"); > + if (!pdata) > return NULL; > - } > > if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0) > pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32); > @@ -2527,8 +2525,6 @@ static struct da7218_pdata *da7218_of_to_pdata(struct > snd_soc_codec *codec) > hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), > GFP_KERNEL); > if (!hpldet_pdata) { > - dev_warn(codec->dev, > - "Failed to allocate memory for hpldet pdata\n"); > of_node_put(hpldet_np); > return pdata; > } > -- > 2.15.0
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 56564ce90cb6..25ab7443d803 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2455,10 +2455,8 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) u32 of_val32; pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { - dev_warn(codec->dev, "Failed to allocate memory for pdata\n"); + if (!pdata) return NULL; - } if (of_property_read_u32(np, "dlg,micbias1-lvl-millivolt", &of_val32) >= 0) pdata->micbias1_lvl = da7218_of_micbias_lvl(codec, of_val32); @@ -2527,8 +2525,6 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), GFP_KERNEL); if (!hpldet_pdata) { - dev_warn(codec->dev, - "Failed to allocate memory for hpldet pdata\n"); of_node_put(hpldet_np); return pdata; }