leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] soc - Clean up with kmemdup()

Browse Source 
Clean up by replacing with kmemdup().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai 2007-02-05 14:56:20 +01:00 committed by Jaroslav Kysela
parent 1ab774e049
commit 88cb42901f
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/wm8731.c
View File

@ -543,14 +543,10 @@ static int wm8731_init(struct snd_soc_device *socdev)
codec->dapm_event = wm8731_dapm_event; codec->dapm_event = wm8731_dapm_event;
codec->dai = &wm8731_dai; codec->dai = &wm8731_dai;
codec->num_dai = 1; codec->num_dai = 1;
codec->reg_cache_size = ARRAY_SIZE(wm8731_reg); codec->reg_cache_size = sizeof(wm8731_reg);
codec->reg_cache = codec->reg_cache = kmemdup(wm8731_reg, sizeof(wm8731_reg), GFP_KERNEL);
kzalloc(sizeof(u16) * ARRAY_SIZE(wm8731_reg), GFP_KERNEL);
if (codec->reg_cache == NULL) if (codec->reg_cache == NULL)
return -ENOMEM; return -ENOMEM;
memcpy(codec->reg_cache,
wm8731_reg, sizeof(u16) * ARRAY_SIZE(wm8731_reg));
codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm8731_reg);
wm8731_reset(codec); wm8731_reset(codec);
@ -627,12 +623,11 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind)
client_template.adapter = adap; client_template.adapter = adap;
client_template.addr = addr; client_template.addr = addr;
i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
if (i2c == NULL) { if (i2c == NULL) {
kfree(codec); kfree(codec);
return -ENOMEM; return -ENOMEM;
} }
memcpy(i2c, &client_template, sizeof(struct i2c_client));
i2c_set_clientdata(i2c, codec); i2c_set_clientdata(i2c, codec);
codec->control_data = i2c; codec->control_data = i2c;

12
sound/soc/codecs/wm8750.c
View File

@ -807,15 +807,10 @@ static int wm8750_init(struct snd_soc_device *socdev)
codec->dapm_event = wm8750_dapm_event; codec->dapm_event = wm8750_dapm_event;
codec->dai = &wm8750_dai; codec->dai = &wm8750_dai;
codec->num_dai = 1; codec->num_dai = 1;
codec->reg_cache_size = ARRAY_SIZE(wm8750_reg); codec->reg_cache_size = sizeof(wm8750_reg);
codec->reg_cache = kmemdup(wm8750_reg, sizeof(wm8750_reg), GFP_KRENEL);
codec->reg_cache =
kzalloc(sizeof(u16) * ARRAY_SIZE(wm8750_reg), GFP_KERNEL);
if (codec->reg_cache == NULL) if (codec->reg_cache == NULL)
return -ENOMEM; return -ENOMEM;
memcpy(codec->reg_cache, wm8750_reg,
sizeof(u16) * ARRAY_SIZE(wm8750_reg));
codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm8750_reg);
wm8750_reset(codec); wm8750_reset(codec);
@ -900,12 +895,11 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind)
client_template.adapter = adap; client_template.adapter = adap;
client_template.addr = addr; client_template.addr = addr;
i2c = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
if (i2c == NULL) { if (i2c == NULL) {
kfree(codec); kfree(codec);
return -ENOMEM; return -ENOMEM;
} }
memcpy(i2c, &client_template, sizeof(struct i2c_client));
i2c_set_clientdata(i2c, codec); i2c_set_clientdata(i2c, codec);
codec->control_data = i2c; codec->control_data = i2c;

10
sound/soc/soc-dapm.c
View File

@ -87,16 +87,10 @@ module_param(dapm_status, int, 0);
MODULE_PARM_DESC(dapm_status, "enable DPM sysfs entries"); MODULE_PARM_DESC(dapm_status, "enable DPM sysfs entries");
/* create a new dapm widget */ /* create a new dapm widget */
static struct snd_soc_dapm_widget *dapm_cnew_widget( static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
const struct snd_soc_dapm_widget *_widget) const struct snd_soc_dapm_widget *_widget)
{ {
struct snd_soc_dapm_widget* widget; return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);
widget = kmalloc(sizeof(struct snd_soc_dapm_widget), GFP_KERNEL);
if (!widget)
return NULL;
memcpy(widget, _widget, sizeof(struct snd_soc_dapm_widget));
return widget;
} }
/* set up initial codec paths */ /* set up initial codec paths */