[PATCH -next 0/2] Use devm_kmemdup to replace devm_kmalloc + memcpy
This patch set use the helper function devm_kmemdup() to replace devm_kmalloc + memcpy, which is the same as implementing the function separately.
Li Zetao (2): ASoC: tas5805m: Use devm_kmemdup to replace devm_kmalloc + memcpy ASoC: SOF: ipc3: Use devm_kmemdup to replace devm_kmalloc + memcpy
sound/soc/codecs/tas5805m.c | 3 +-- sound/soc/sof/ipc3.c | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-)
Use the helper function devm_kmemdup() rather than duplicating its implementation, which helps to enhance code readability.
Signed-off-by: Li Zetao lizetao1@huawei.com --- sound/soc/codecs/tas5805m.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index aca3756ffab6..3b53eba38a0b 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -520,12 +520,11 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c) }
tas5805m->dsp_cfg_len = fw->size; - tas5805m->dsp_cfg_data = devm_kmalloc(dev, fw->size, GFP_KERNEL); + tas5805m->dsp_cfg_data = devm_kmemdup(dev, fw->data, fw->size, GFP_KERNEL); if (!tas5805m->dsp_cfg_data) { release_firmware(fw); return -ENOMEM; } - memcpy(tas5805m->dsp_cfg_data, fw->data, fw->size);
release_firmware(fw);
On Thu, Aug 10, 2023 at 07:47:37PM +0800, Li Zetao wrote:
- tas5805m->dsp_cfg_data = devm_kmalloc(dev, fw->size, GFP_KERNEL);
- tas5805m->dsp_cfg_data = devm_kmemdup(dev, fw->data, fw->size, GFP_KERNEL); if (!tas5805m->dsp_cfg_data) { release_firmware(fw); return -ENOMEM; }
memcpy(tas5805m->dsp_cfg_data, fw->data, fw->size);
release_firmware(fw);
You could probably now move the release_firmware call to be immediately after the devm_kmemdup attempt, and avoid having to call it from two different places.
Cheers, Daniel
Use the helper function devm_kmemdup() rather than duplicating its implementation, which helps to enhance code readability.
Signed-off-by: Li Zetao lizetao1@huawei.com --- sound/soc/sof/ipc3.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/sof/ipc3.c b/sound/soc/sof/ipc3.c index 33df028d4854..fb40378ad084 100644 --- a/sound/soc/sof/ipc3.c +++ b/sound/soc/sof/ipc3.c @@ -567,13 +567,10 @@ int sof_ipc3_get_cc_info(struct snd_sof_dev *sdev, /* create read-only cc_version debugfs to store compiler version info */ /* use local copy of the cc_version to prevent data corruption */ if (sdev->first_boot) { - sdev->cc_version = devm_kmalloc(sdev->dev, cc->ext_hdr.hdr.size, - GFP_KERNEL); - + sdev->cc_version = devm_kmemdup(sdev->dev, cc, cc->ext_hdr.hdr.size, GFP_KERNEL); if (!sdev->cc_version) return -ENOMEM;
- memcpy(sdev->cc_version, cc, cc->ext_hdr.hdr.size); ret = snd_sof_debugfs_buf_item(sdev, sdev->cc_version, cc->ext_hdr.hdr.size, "cc_version", 0444);
On Thu, 10 Aug 2023 19:47:38 +0800 Li Zetao lizetao1@huawei.com wrote:
Use the helper function devm_kmemdup() rather than duplicating its implementation, which helps to enhance code readability.
Signed-off-by: Li Zetao lizetao1@huawei.com
Reviewed-by: Luca Ceresoli luca.ceresoli@bootlin.com
On Thu, 10 Aug 2023 19:47:36 +0800, Li Zetao wrote:
This patch set use the helper function devm_kmemdup() to replace devm_kmalloc + memcpy, which is the same as implementing the function separately.
Li Zetao (2): ASoC: tas5805m: Use devm_kmemdup to replace devm_kmalloc + memcpy ASoC: SOF: ipc3: Use devm_kmemdup to replace devm_kmalloc + memcpy
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: tas5805m: Use devm_kmemdup to replace devm_kmalloc + memcpy commit: b0a4c7f5921d9c2998bdd767a93d995786d72adc [2/2] ASoC: SOF: ipc3: Use devm_kmemdup to replace devm_kmalloc + memcpy commit: 29681184da28babc990a66e197d27ab98f2027af
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
participants (4)
-
Daniel Beer -
Li Zetao -
Luca Ceresoli -
Mark Brown