| Message ID | 6dc71b14-4c14-82f6-9dad-92bfa9854de2@users.sourceforge.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 13d5ea5f10b7359cd0f846179fe0b2411e12cfeb |
| Headers | show |
On 23 November 2017 17:33, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Thu, 23 Nov 2017 17:56:54 +0100 > > Omit an extra message for a memory allocation failure in this function. I'm not sure this is an extra message. We don't return -ENOMEM as a result of this operation and probe won't fail on this. So does devm_kzalloc() print error messages? > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > sound/soc/codecs/da7213.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c > index 41d9b1da27c2..d1b77a0e3b74 100644 > --- a/sound/soc/codecs/da7213.c > +++ b/sound/soc/codecs/da7213.c > @@ -1654,10 +1654,8 @@ static struct da7213_platform_data > u32 fw_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 (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0) > pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32); > -- > 2.15.0
On Fri, 24 Nov 2017, Adam Thomson wrote: > On 23 November 2017 17:33, SF Markus Elfring wrote: > > > From: Markus Elfring <elfring@users.sourceforge.net> > > Date: Thu, 23 Nov 2017 17:56:54 +0100 > > > > Omit an extra message for a memory allocation failure in this function. > > I'm not sure this is an extra message. We don't return -ENOMEM as a result of > this operation and probe won't fail on this. So does devm_kzalloc() print error > messages? Unless there is NO WARN, a backtrace will be generated in the out of memory case. julia > > > This issue was detected by using the Coccinelle software. > > > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > > --- > > sound/soc/codecs/da7213.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c > > index 41d9b1da27c2..d1b77a0e3b74 100644 > > --- a/sound/soc/codecs/da7213.c > > +++ b/sound/soc/codecs/da7213.c > > @@ -1654,10 +1654,8 @@ static struct da7213_platform_data > > u32 fw_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 (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0) > > pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32); > > -- > > 2.15.0 > N?????r??y??????X??ǧv???){.n?????z?ޖ6?????)?????* jg??? ?????ݢj/???z?ޖ????ޙ????&?)ߡ?a???????G???????:+v???w????
On 24 November 2017 11:33, Julia Lawall wrote: > On Fri, 24 Nov 2017, Adam Thomson wrote: > > > On 23 November 2017 17:33, SF Markus Elfring wrote: > > > > > From: Markus Elfring <elfring@users.sourceforge.net> > > > Date: Thu, 23 Nov 2017 17:56:54 +0100 > > > > > > Omit an extra message for a memory allocation failure in this function. > > > > I'm not sure this is an extra message. We don't return -ENOMEM as a result of > > this operation and probe won't fail on this. So does devm_kzalloc() print error > > messages? > > Unless there is NO WARN, a backtrace will be generated in the out of > memory case. > > julia Ok, fair enough. In which case: Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > > > > > This issue was detected by using the Coccinelle software. > > > > > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > > > --- > > > sound/soc/codecs/da7213.c | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > > > diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c > > > index 41d9b1da27c2..d1b77a0e3b74 100644 > > > --- a/sound/soc/codecs/da7213.c > > > +++ b/sound/soc/codecs/da7213.c > > > @@ -1654,10 +1654,8 @@ static struct da7213_platform_data > > > u32 fw_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 (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0) > > > pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32); > > > -- > > > 2.15.0 > > N?????r??y??????X??ǧv???){.n?????z?ޖ6?????)?????*¬ > jg??? ?????ݢj/???z?ޖ????ޙ????&?)ߡ?a???????G????? ??:+v???w????
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 41d9b1da27c2..d1b77a0e3b74 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1654,10 +1654,8 @@ static struct da7213_platform_data u32 fw_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 (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0) pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);