5 files changed, 15 insertions, 15 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index e69d5b739e80..03617ec0742f 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -865,7 +865,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
+        emu = kzalloc(sizeof(*emu), GFP_KERNEL);
         if (emu == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 52c7826df440..8c151af521d7 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -395,7 +395,7 @@ static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream)
         if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
                 return err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = chip;
@@ -571,7 +571,7 @@ static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream)
         if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
                 return err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
 
@@ -920,7 +920,7 @@ static int __devinit snd_emu10k1x_create(snd_card_t *card,
                 return -ENXIO;
         }
   
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 2f7a03103c91..646b5d972e6f 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1036,7 +1036,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu)
         spin_lock_init(&emu->fx8010.irq_lock);
         INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
 
-        if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL ||
+        if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
             (icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
             (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) {
                 err = -ENOMEM;
@@ -1503,11 +1503,11 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
         spin_lock_init(&emu->fx8010.irq_lock);
         INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
 
-        if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL)
+        if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
         if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
             (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL ||
-            (ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL)) == NULL) {
+            (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
                 err = -ENOMEM;
                 goto __err;
         }
@@ -2217,7 +2217,7 @@ static int snd_emu10k1_fx8010_ioctl(snd_hwdep_t * hw, struct file *file, unsigne
                 kfree(ipcm);
                 return res;
         case SNDRV_EMU10K1_IOCTL_PCM_PEEK:
-                ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL);
+                ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL);
                 if (ipcm == NULL)
                         return -ENOMEM;
                 if (copy_from_user(ipcm, argp, sizeof(*ipcm))) {
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 9c35f6dde1b5..66ba27afe962 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1016,7 +1016,7 @@ static int snd_emu10k1_efx_playback_open(snd_pcm_substream_t * substream)
         snd_pcm_runtime_t *runtime = substream->runtime;
         int i;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
@@ -1049,7 +1049,7 @@ static int snd_emu10k1_playback_open(snd_pcm_substream_t * substream)
         snd_pcm_runtime_t *runtime = substream->runtime;
         int i, err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
@@ -1094,7 +1094,7 @@ static int snd_emu10k1_capture_open(snd_pcm_substream_t * substream)
         snd_pcm_runtime_t *runtime = substream->runtime;
         emu10k1_pcm_t *epcm;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
@@ -1130,7 +1130,7 @@ static int snd_emu10k1_capture_mic_open(snd_pcm_substream_t * substream)
         emu10k1_pcm_t *epcm;
         snd_pcm_runtime_t *runtime = substream->runtime;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
@@ -1170,7 +1170,7 @@ static int snd_emu10k1_capture_efx_open(snd_pcm_substream_t * substream)
         int nefx = emu->audigy ? 64 : 32;
         int idx;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
         epcm->emu = emu;
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index a1691330d3b6..d59c7f345ad6 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -178,7 +178,7 @@ static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, in
         snd_pcm_runtime_t *runtime = substream->runtime;
         int err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         //snd_printk("epcm kcalloc: %p\n", epcm);
 
         if (epcm == NULL)
@@ -214,7 +214,7 @@ static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int
         snd_pcm_runtime_t *runtime = substream->runtime;
         int err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         //snd_printk("epcm kcalloc: %p\n", epcm);
 
         if (epcm == NULL)