lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] Conversions from kmalloc+memset to k(z|c)alloc

Browse Source 
sound: Conversions from kmalloc+memset to k(c|z)alloc.

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Panagiotis Issaris
2006-07-25 15:28:03 +02:00
committed by Jaroslav Kysela
parent fb6a0d635d
commit 59feddb25f
10 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/oss/mixer_oss.c
View File

@@ -988,13 +988,12 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
if (ptr->index == 0 && (kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0)) != NULL) { if (ptr->index == 0 && (kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0)) != NULL) {
struct snd_ctl_elem_info *uinfo; struct snd_ctl_elem_info *uinfo;
uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL); uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);
if (! uinfo) { if (! uinfo) {
up_read(&mixer->card->controls_rwsem); up_read(&mixer->card->controls_rwsem);
return -ENOMEM; return -ENOMEM;
} }
memset(uinfo, 0, sizeof(*uinfo));
if (kctl->info(kctl, uinfo)) { if (kctl->info(kctl, uinfo)) {
up_read(&mixer->card->controls_rwsem); up_read(&mixer->card->controls_rwsem);
return 0; return 0;

3
sound/core/seq/seq_device.c
View File

@@ -372,10 +372,9 @@ static struct ops_list * create_driver(char *id)
{ {
struct ops_list *ops; struct ops_list *ops;
ops = kmalloc(sizeof(*ops), GFP_KERNEL); ops = kzalloc(sizeof(*ops), GFP_KERNEL);
if (ops == NULL) if (ops == NULL)
return ops; return ops;
memset(ops, 0, sizeof(*ops));
/* set up driver entry */ /* set up driver entry */
strlcpy(ops->id, id, sizeof(ops->id)); strlcpy(ops->id, id, sizeof(ops->id));

9
sound/core/sgbuf.c
View File

@@ -68,21 +68,18 @@ void *snd_malloc_sgbuf_pages(struct device *device,
dmab->area = NULL; dmab->area = NULL;
dmab->addr = 0; dmab->addr = 0;
dmab->private_data = sgbuf = kmalloc(sizeof(*sgbuf), GFP_KERNEL); dmab->private_data = sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL);
if (! sgbuf) if (! sgbuf)
return NULL; return NULL;
memset(sgbuf, 0, sizeof(*sgbuf));
sgbuf->dev = device; sgbuf->dev = device;
pages = snd_sgbuf_aligned_pages(size); pages = snd_sgbuf_aligned_pages(size);
sgbuf->tblsize = sgbuf_align_table(pages); sgbuf->tblsize = sgbuf_align_table(pages);
sgbuf->table = kmalloc(sizeof(*sgbuf->table) * sgbuf->tblsize, GFP_KERNEL); sgbuf->table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->table), GFP_KERNEL);
if (! sgbuf->table) if (! sgbuf->table)
goto _failed; goto _failed;
memset(sgbuf->table, 0, sizeof(*sgbuf->table) * sgbuf->tblsize); sgbuf->page_table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->page_table), GFP_KERNEL);
sgbuf->page_table = kmalloc(sizeof(*sgbuf->page_table) * sgbuf->tblsize, GFP_KERNEL);
if (! sgbuf->page_table) if (! sgbuf->page_table)
goto _failed; goto _failed;
memset(sgbuf->page_table, 0, sizeof(*sgbuf->page_table) * sgbuf->tblsize);
/* allocate each page */ /* allocate each page */
for (i = 0; i < pages; i++) { for (i = 0; i < pages; i++) {

7
sound/drivers/vx/vx_pcm.c
View File

@@ -1252,18 +1252,15 @@ static int vx_init_audio_io(struct vx_core *chip)
chip->audio_info = rmh.Stat[1]; chip->audio_info = rmh.Stat[1];
/* allocate pipes */ /* allocate pipes */
chip->playback_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_outs, GFP_KERNEL); chip->playback_pipes = kcalloc(chip->audio_outs, sizeof(struct vx_pipe *), GFP_KERNEL);
if (!chip->playback_pipes) if (!chip->playback_pipes)
return -ENOMEM; return -ENOMEM;
chip->capture_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_ins, GFP_KERNEL); chip->capture_pipes = kcalloc(chip->audio_ins, sizeof(struct vx_pipe *), GFP_KERNEL);
if (!chip->capture_pipes) { if (!chip->capture_pipes) {
kfree(chip->playback_pipes); kfree(chip->playback_pipes);
return -ENOMEM; return -ENOMEM;
} }
memset(chip->playback_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_outs);
memset(chip->capture_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_ins);
preferred = chip->ibl.size; preferred = chip->ibl.size;
chip->ibl.size = 0; chip->ibl.size = 0;
vx_set_ibl(chip, &chip->ibl); /* query the info */ vx_set_ibl(chip, &chip->ibl); /* query the info */

4
sound/pci/echoaudio/echoaudio.c
View File

@@ -236,9 +236,9 @@ static int pcm_open(struct snd_pcm_substream *substream,
chip = snd_pcm_substream_chip(substream); chip = snd_pcm_substream_chip(substream);
runtime = substream->runtime; runtime = substream->runtime;
if (!(pipe = kmalloc(sizeof(struct audiopipe), GFP_KERNEL))) pipe = kzalloc(sizeof(struct audiopipe), GFP_KERNEL);
if (!pipe)
return -ENOMEM; return -ENOMEM;
memset(pipe, 0, sizeof(struct audiopipe));
pipe->index = -1; /* Not configured yet */ pipe->index = -1; /* Not configured yet */
/* Set up hw capabilities and contraints */ /* Set up hw capabilities and contraints */

3
sound/ppc/awacs.c
View File

@@ -801,11 +801,10 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf; chip->revision = (in_le32(&chip->awacs->codec_stat) >> 12) & 0xf;
#ifdef PMAC_AMP_AVAIL #ifdef PMAC_AMP_AVAIL
if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) { if (chip->revision == 3 && chip->has_iic && CHECK_CUDA_AMP()) {
struct awacs_amp *amp = kmalloc(sizeof(*amp), GFP_KERNEL); struct awacs_amp *amp = kzalloc(sizeof(*amp), GFP_KERNEL);
if (! amp) if (! amp)
return -ENOMEM; return -ENOMEM;
chip->mixer_data = amp; chip->mixer_data = amp;
memset(amp, 0, sizeof(*amp));
chip->mixer_free = awacs_amp_free; chip->mixer_free = awacs_amp_free;
awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */ awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */
awacs_amp_set_vol(amp, 1, 63, 63, 0); awacs_amp_set_vol(amp, 1, 63, 63, 0);

3
sound/ppc/daca.c
View File

@@ -258,10 +258,9 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
request_module("i2c-powermac"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */ #endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL); mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix) if (! mix)
return -ENOMEM; return -ENOMEM;
memset(mix, 0, sizeof(*mix));
chip->mixer_data = mix; chip->mixer_data = mix;
chip->mixer_free = daca_cleanup; chip->mixer_free = daca_cleanup;
mix->amp_on = 1; /* default on */ mix->amp_on = 1; /* default on */

3
sound/ppc/keywest.c
View File

@@ -64,11 +64,10 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
if (strncmp(i2c_device_name(adapter), "mac-io", 6)) if (strncmp(i2c_device_name(adapter), "mac-io", 6))
return 0; /* ignored */ return 0; /* ignored */
new_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (! new_client) if (! new_client)
return -ENOMEM; return -ENOMEM;
memset(new_client, 0, sizeof(*new_client));
new_client->addr = keywest_ctx->addr; new_client->addr = keywest_ctx->addr;
i2c_set_clientdata(new_client, keywest_ctx); i2c_set_clientdata(new_client, keywest_ctx);
new_client->adapter = adapter; new_client->adapter = adapter;

3
sound/ppc/tumbler.c
View File

@@ -1316,10 +1316,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
request_module("i2c-powermac"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */ #endif /* CONFIG_KMOD */
mix = kmalloc(sizeof(*mix), GFP_KERNEL); mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix) if (! mix)
return -ENOMEM; return -ENOMEM;
memset(mix, 0, sizeof(*mix));
mix->headphone_irq = -1; mix->headphone_irq = -1;
chip->mixer_data = mix; chip->mixer_data = mix;

6
sound/usb/usbaudio.c
View File

@@ -2260,10 +2260,9 @@ static int add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct aud
} }
/* create a new pcm */ /* create a new pcm */
as = kmalloc(sizeof(*as), GFP_KERNEL); as = kzalloc(sizeof(*as), GFP_KERNEL);
if (! as) if (! as)
return -ENOMEM; return -ENOMEM;
memset(as, 0, sizeof(*as));
as->pcm_index = chip->pcm_devs; as->pcm_index = chip->pcm_devs;
as->chip = chip; as->chip = chip;
as->fmt_type = fp->fmt_type; as->fmt_type = fp->fmt_type;
@@ -2633,13 +2632,12 @@ static int parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
csep = NULL; csep = NULL;
} }
fp = kmalloc(sizeof(*fp), GFP_KERNEL); fp = kzalloc(sizeof(*fp), GFP_KERNEL);
if (! fp) { if (! fp) {
snd_printk(KERN_ERR "cannot malloc\n"); snd_printk(KERN_ERR "cannot malloc\n");
return -ENOMEM; return -ENOMEM;
} }
memset(fp, 0, sizeof(*fp));
fp->iface = iface_no; fp->iface = iface_no;
fp->altsetting = altno; fp->altsetting = altno;
fp->altset_idx = i; fp->altset_idx = i;