diff options
| author | Mark Brown <broonie@kernel.org> | 2023-08-15 20:22:33 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-08-15 20:22:33 +0200 |
| commit | a90a7a001624072f47c55716f74c5bc127e17656 (patch) | |
| tree | 185638b61051e121a595b5600aa6545145897755 /sound | |
| parent | ASoC: SOF: topology: simplify kcontrol names with (diff) | |
| parent | ASoC: SOF: ipc3: Use devm_kmemdup to replace devm_kmalloc + memcpy (diff) | |
| download | linux-a90a7a001624072f47c55716f74c5bc127e17656.tar.xz linux-a90a7a001624072f47c55716f74c5bc127e17656.zip | |
Use devm_kmemdup to replace devm_kmalloc + memcpy
Merge series from Li Zetao <lizetao1@huawei.com>:
This patch set use the helper function devm_kmemdup() to replace
devm_kmalloc + memcpy, which is the same as implementing the function
separately.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tas5805m.c | 3 | ||||
| -rw-r--r-- | sound/soc/sof/ipc3.c | 5 |
2 files changed, 2 insertions, 6 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); 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); |