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.
This commit is contained in:
Mark Brown 2023-08-15 19:22:33 +01:00
commit a90a7a0016
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 2 additions and 6 deletions

View File

@ -520,12 +520,11 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c)
} }
tas5805m->dsp_cfg_len = fw->size; 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) { if (!tas5805m->dsp_cfg_data) {
release_firmware(fw); release_firmware(fw);
return -ENOMEM; return -ENOMEM;
} }
memcpy(tas5805m->dsp_cfg_data, fw->data, fw->size);
release_firmware(fw); release_firmware(fw);

View File

@ -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 */ /* create read-only cc_version debugfs to store compiler version info */
/* use local copy of the cc_version to prevent data corruption */ /* use local copy of the cc_version to prevent data corruption */
if (sdev->first_boot) { if (sdev->first_boot) {
sdev->cc_version = devm_kmalloc(sdev->dev, cc->ext_hdr.hdr.size, sdev->cc_version = devm_kmemdup(sdev->dev, cc, cc->ext_hdr.hdr.size, GFP_KERNEL);
GFP_KERNEL);
if (!sdev->cc_version) if (!sdev->cc_version)
return -ENOMEM; return -ENOMEM;
memcpy(sdev->cc_version, cc, cc->ext_hdr.hdr.size);
ret = snd_sof_debugfs_buf_item(sdev, sdev->cc_version, ret = snd_sof_debugfs_buf_item(sdev, sdev->cc_version,
cc->ext_hdr.hdr.size, cc->ext_hdr.hdr.size,
"cc_version", 0444); "cc_version", 0444);