6 files changed, 9 insertions, 19 deletions

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 4405d96cbedf..2e0a31613ee6 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -1796,7 +1796,7 @@ static int __devinit aureon_init(ice1712_t *ice)
         }
 
         /* to remeber the register values of CS8415 */
-        ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+        ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL);
         if (! ice->akm)
                 return -ENOMEM;
         ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index b97f50d10ba3..a6d98013c331 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -100,12 +100,6 @@ MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec r
 module_param_array(model, charp, NULL, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
 
-#ifndef PCI_VENDOR_ID_ICE
-#define PCI_VENDOR_ID_ICE               0x1412
-#endif
-#ifndef PCI_DEVICE_ID_ICE_1712
-#define PCI_DEVICE_ID_ICE_1712          0x1712
-#endif
 
 static struct pci_device_id snd_ice1712_ids[] = {
         { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* ICE1712 */
@@ -2535,7 +2529,7 @@ static int __devinit snd_ice1712_create(snd_card_t * card,
                 return -ENXIO;
         }
 
-        ice = kcalloc(1, sizeof(*ice), GFP_KERNEL);
+        ice = kzalloc(sizeof(*ice), GFP_KERNEL);
         if (ice == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
@@ -2741,6 +2735,7 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
         .name = "ICE1712",
+        .owner = THIS_MODULE,
         .id_table = snd_ice1712_ids,
         .probe = snd_ice1712_probe,
         .remove = __devexit_p(snd_ice1712_remove),
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index c7af5e5fee13..c3ce8f93740b 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -83,12 +83,6 @@ MODULE_PARM_DESC(enable, "Enable ICE1724 soundcard.");
 module_param_array(model, charp, NULL, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
 
-#ifndef PCI_VENDOR_ID_ICE
-#define PCI_VENDOR_ID_ICE               0x1412
-#endif
-#ifndef PCI_DEVICE_ID_VT1724
-#define PCI_DEVICE_ID_VT1724            0x1724
-#endif
 
 /* Both VT1720 and VT1724 have the same PCI IDs */
 static struct pci_device_id snd_vt1724_ids[] = {
@@ -2130,7 +2124,7 @@ static int __devinit snd_vt1724_create(snd_card_t * card,
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
-        ice = kcalloc(1, sizeof(*ice), GFP_KERNEL);
+        ice = kzalloc(sizeof(*ice), GFP_KERNEL);
         if (ice == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
@@ -2321,6 +2315,7 @@ static void __devexit snd_vt1724_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
         .name = "ICE1724",
+        .owner = THIS_MODULE,
         .id_table = snd_vt1724_ids,
         .probe = snd_vt1724_probe,
         .remove = __devexit_p(snd_vt1724_remove),
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 3fb297b969cd..2437876a44e4 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -182,7 +182,7 @@ static int __devinit juli_init(ice1712_t *ice)
                 ice->num_total_dacs = 2;
                 ice->num_total_adcs = 2;
 
-                ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+                ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL);
                 if (! ak)
                         return -ENOMEM;
                 ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c
index 5bf734b04fa0..dcf1e8ca3f66 100644
--- a/sound/pci/ice1712/phase.c
+++ b/sound/pci/ice1712/phase.c
@@ -122,7 +122,7 @@ static int __devinit phase22_init(ice1712_t *ice)
         }
 
         // Initialize analog chips
-        ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+        ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL);
         if (! ak)
                 return -ENOMEM;
         ice->akm_codecs = 1;
@@ -386,7 +386,7 @@ static int __devinit phase28_init(ice1712_t *ice)
         ice->num_total_adcs = 2;
 
         // Initialize analog chips
-        ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+        ak = ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL);
         if (!ak)
                 return -ENOMEM;
         ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 25f827d8fbd9..a5f852b1f575 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -781,7 +781,7 @@ static int __devinit pontis_init(ice1712_t *ice)
         ice->num_total_adcs = 2;
 
         /* to remeber the register values */
-        ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+        ice->akm = kzalloc(sizeof(akm4xxx_t), GFP_KERNEL);
         if (! ice->akm)
                 return -ENOMEM;
         ice->akm_codecs = 1;