[PATCH 0/2] ASoC: da7213: Adjustments for two function implementations

[PATCH 0/2] ASoC: da7213: Adjustments for two function implementations

[SF Markus Elfring]

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 23 Nov 2017 18:28:38 +0100

Two update suggestions were taken into account
from static source code analysis.

Markus Elfring (2):
  Delete an error message for a failed memory allocation in da7213_fw_to_pdata()
  Improve a size determination in da7213_i2c_probe()

 sound/soc/codecs/da7213.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

-- 
2.15.0

[PATCH 1/2] ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()

[SF Markus Elfring]

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.

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

[PATCH 2/2] ASoC: da7213: Improve a size determination in da7213_i2c_probe()

[SF Markus Elfring]

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 23 Nov 2017 18:15:30 +0100

Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/soc/codecs/da7213.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index d1b77a0e3b74..b2b4e90fc02a 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1853,8 +1853,7 @@ static int da7213_i2c_probe(struct i2c_client *i2c,
 	struct da7213_priv *da7213;
 	int ret;
 
-	da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv),
-			      GFP_KERNEL);
+	da7213 = devm_kzalloc(&i2c->dev, sizeof(*da7213), GFP_KERNEL);
 	if (!da7213)
 		return -ENOMEM;
 
-- 
2.15.0

RE: [PATCH 1/2] ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()

[Adam Thomson]

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

RE: [PATCH 1/2] ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()

[Julia Lawall]

[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]



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?????)?????*\x1fjg???\x1e?????ݢj/???z?ޖ????ޙ????&?)ߡ?a???????G?????\x0f??:+v???w????

RE: [PATCH 1/2] ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()

[Adam Thomson]

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????

RE: [PATCH 2/2] ASoC: da7213: Improve a size determination in da7213_i2c_probe()

[Adam Thomson]

On 23 November 2017 17:34, SF Markus Elfring wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Thu, 23 Nov 2017 18:15:30 +0100
> 
> Replace the specification of a data structure by a pointer dereference
> as the parameter for the operator "sizeof" to make the corresponding size
> determination a bit safer according to the Linux coding style convention.
> 
> 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/da7213.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
> index d1b77a0e3b74..b2b4e90fc02a 100644
> --- a/sound/soc/codecs/da7213.c
> +++ b/sound/soc/codecs/da7213.c
> @@ -1853,8 +1853,7 @@ static int da7213_i2c_probe(struct i2c_client *i2c,
>  	struct da7213_priv *da7213;
>  	int ret;
> 
> -	da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv),
> -			      GFP_KERNEL);
> +	da7213 = devm_kzalloc(&i2c->dev, sizeof(*da7213), GFP_KERNEL);
>  	if (!da7213)
>  		return -ENOMEM;
> 
> --
> 2.15.0

Applied "ASoC: da7213: Improve a size determination in da7213_i2c_probe()" to the asoc tree

[Mark Brown]

The patch

   ASoC: da7213: Improve a size determination in da7213_i2c_probe()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 8080699a3649cb0a0aed2c650a7a3a76c2025b30 Mon Sep 17 00:00:00 2001
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 23 Nov 2017 18:15:30 +0100
Subject: [PATCH] ASoC: da7213: Improve a size determination in
 da7213_i2c_probe()

Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.

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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/da7213.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index d1b77a0e3b74..b2b4e90fc02a 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1853,8 +1853,7 @@ static int da7213_i2c_probe(struct i2c_client *i2c,
 	struct da7213_priv *da7213;
 	int ret;
 
-	da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv),
-			      GFP_KERNEL);
+	da7213 = devm_kzalloc(&i2c->dev, sizeof(*da7213), GFP_KERNEL);
 	if (!da7213)
 		return -ENOMEM;
 
-- 
2.15.0

Applied "ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()" to the asoc tree

[Mark Brown]

The patch

   ASoC: da7213: Delete an error message for a failed memory allocation in da7213_fw_to_pdata()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 13d5ea5f10b7359cd0f846179fe0b2411e12cfeb Mon Sep 17 00:00:00 2001
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 23 Nov 2017 17:56:54 +0100
Subject: [PATCH] ASoC: da7213: Delete an error message for a failed memory
 allocation in da7213_fw_to_pdata()

Omit an extra message 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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 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