ALSA: hda/ca0132: fix array_size.cocci warnings

Commit Message

kernel test robot May 14, 2018, 7:02 p.m. UTC

From: Fengguang Wu <[e-mail]>

sound/pci/hda/patch_ca0132.c:5062:50-51: WARNING: Use ARRAY_SIZE
sound/pci/hda/patch_ca0132.c:5092:50-51: WARNING: Use ARRAY_SIZE

 Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element

Semantic patch information:
 This makes an effort to find cases where ARRAY_SIZE can be used such as
 where there is a division of sizeof the array by the sizeof its first
 element or by any indexed element or the element type. It replaces the
 division of the two sizeofs by ARRAY_SIZE.

Generated by: scripts/coccinelle/misc/array_size.cocci

Fixes: 47cdf76e44e8 ("ALSA: hda/ca0132: Add new control changes for SBZ + R3Di")
CC: Connor McAdams <[e-mail]>
Signed-off-by: Fengguang Wu <[e-mail]>
---

 patch_ca0132.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Takashi Iwai May 14, 2018, 7:24 p.m. UTC | #1

On Mon, 14 May 2018 21:02:14 +0200,
kbuild test robot wrote:
> 
> From: Fengguang Wu <[e-mail]>
> 
> sound/pci/hda/patch_ca0132.c:5062:50-51: WARNING: Use ARRAY_SIZE
> sound/pci/hda/patch_ca0132.c:5092:50-51: WARNING: Use ARRAY_SIZE
> 
>  Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element
> 
> Semantic patch information:
>  This makes an effort to find cases where ARRAY_SIZE can be used such as
>  where there is a division of sizeof the array by the sizeof its first
>  element or by any indexed element or the element type. It replaces the
>  division of the two sizeofs by ARRAY_SIZE.
> 
> Generated by: scripts/coccinelle/misc/array_size.cocci
> 
> Fixes: 47cdf76e44e8 ("ALSA: hda/ca0132: Add new control changes for SBZ + R3Di")
> CC: Connor McAdams <[e-mail]>
> Signed-off-by: Fengguang Wu <[e-mail]>

Applied, thanks.


Takashi

Patch

--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -5059,8 +5059,7 @@  static int ca0132_alt_svm_setting_put(st
 static int ca0132_alt_eq_preset_info(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_info *uinfo)
 {
-	unsigned int items = sizeof(ca0132_alt_eq_presets)
-				/ sizeof(struct ct_eq_preset);
+	unsigned int items = ARRAY_SIZE(ca0132_alt_eq_presets);
 
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = 1;
@@ -5089,8 +5088,7 @@  static int ca0132_alt_eq_preset_put(stru
 	struct ca0132_spec *spec = codec->spec;
 	int i, err = 0;
 	int sel = ucontrol->value.enumerated.item[0];
-	unsigned int items = sizeof(ca0132_alt_eq_presets)
-				/ sizeof(struct ct_eq_preset);
+	unsigned int items = ARRAY_SIZE(ca0132_alt_eq_presets);
 
 	if (sel >= items)
 		return 0;