ASoC: Intel: avs: use devm_kmemdup_array()

Convert to use devm_kmemdup_array() and while at it, use source size
instead of destination.

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patch.msgid.link/20250228062812.150004-2-raag.jadav@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c
index 76078a7005b07d3ba2f1f732f78acf063583773f..9507a96f26aca8bd6b87cef8bc292c7297b81b6f 100644 (file)
--- a/sound/soc/intel/avs/boards/da7219.c
+++ b/sound/soc/intel/avs/boards/da7219.c
@@ -113,7 +113,8 @@ static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime)
        }
 
        num_pins = ARRAY_SIZE(card_headset_pins);
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c
index 426ce37105aebd92f63364a395f700c6b2b2f1e7..6f3c4f6c930232353947fc5db5548d80fcfe0880 100644 (file)
--- a/sound/soc/intel/avs/boards/es8336.c
+++ b/sound/soc/intel/avs/boards/es8336.c
@@ -109,7 +109,8 @@ static int avs_es8336_codec_init(struct snd_soc_pcm_runtime *runtime)
        data = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c
index bf902540744c5ebc4a499fae00a2f00ccd64c3d5..6833eebd82d66226bd8548503880d4f862a5b74a 100644 (file)
--- a/sound/soc/intel/avs/boards/nau8825.c
+++ b/sound/soc/intel/avs/boards/nau8825.c
@@ -88,7 +88,8 @@ static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c
index 4b6c02a402047864599da2a2bd683126c31f4d6a..f5caafc21861306dfdb72358c3e30f6f5d0c547a 100644 (file)
--- a/sound/soc/intel/avs/boards/rt274.c
+++ b/sound/soc/intel/avs/boards/rt274.c
@@ -98,7 +98,8 @@ static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c
index e40563ca99fd5001136ad1c08f46a0998c9b9106..1eb0399c0fae8f63b678ddb756b10b25c5f33f8b 100644 (file)
--- a/sound/soc/intel/avs/boards/rt286.c
+++ b/sound/soc/intel/avs/boards/rt286.c
@@ -59,7 +59,8 @@ static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c
index 94fce07c83f9e91d5ddfe12c599209f5ea2906af..85269a3be9817698f02ea0d68da7a54d85a74d89 100644 (file)
--- a/sound/soc/intel/avs/boards/rt298.c
+++ b/sound/soc/intel/avs/boards/rt298.c
@@ -70,7 +70,8 @@ static int avs_rt298_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c
index b456b9d1466549c924fa45082037076199745fc0..e3310b3268baafdf5a02fa182370941142f5933a 100644 (file)
--- a/sound/soc/intel/avs/boards/rt5663.c
+++ b/sound/soc/intel/avs/boards/rt5663.c
@@ -65,7 +65,8 @@ static int avs_rt5663_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = &priv->jack;
        num_pins = ARRAY_SIZE(card_headset_pins);
 
-       pins = devm_kmemdup(card->dev, card_headset_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_headset_pins, num_pins,
+                                 sizeof(card_headset_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
 

diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c
index 335960cfd7ba13cb822e76e9826026074dfc1c9e..339df0b944c1745567c65904c8dc2fc06397397f 100644 (file)
--- a/sound/soc/intel/avs/boards/rt5682.c
+++ b/sound/soc/intel/avs/boards/rt5682.c
@@ -102,7 +102,8 @@ static int avs_rt5682_codec_init(struct snd_soc_pcm_runtime *runtime)
        jack = snd_soc_card_get_drvdata(card);
        num_pins = ARRAY_SIZE(card_jack_pins);
 
-       pins = devm_kmemdup(card->dev, card_jack_pins, sizeof(*pins) * num_pins, GFP_KERNEL);
+       pins = devm_kmemdup_array(card->dev, card_jack_pins, num_pins,
+                                 sizeof(card_jack_pins[0]), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;