5 files changed, 5 insertions, 10 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index c96b7fe882a4..ec9e5f32f0ae 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -365,10 +365,9 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
         if (np == NULL)
                 return NULL;
 
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
-        memset(dev, 0, sizeof(*dev));
 
         dev->bus = &chip->lbus;
         dev->media_bay = in_bay;
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index f8e1a135bf9d..d409f6759482 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1053,10 +1053,9 @@ static int smu_open(struct inode *inode, struct file *file)
         struct smu_private *pp;
         unsigned long flags;
 
-        pp = kmalloc(sizeof(struct smu_private), GFP_KERNEL);
+        pp = kzalloc(sizeof(struct smu_private), GFP_KERNEL);
         if (pp == 0)
                 return -ENOMEM;
-        memset(pp, 0, sizeof(struct smu_private));
         spin_lock_init(&pp->lock);
         pp->mode = smu_file_commands;
         init_waitqueue_head(&pp->wait);
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 3d90fc002097..e43554e754a4 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -318,10 +318,9 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name)
         if (adap == NULL)
                 return NULL;
 
-        clt = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        clt = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
         if (clt == NULL)
                 return NULL;
-        memset(clt, 0, sizeof(struct i2c_client));
 
         clt->addr = (id >> 1) & 0x7f;
         clt->adapter = adap;
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 3d0354e96a97..5452da1bb1a5 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -431,9 +431,8 @@ do_probe( struct i2c_adapter *adapter, int addr, int kind )
                                      | I2C_FUNC_SMBUS_WRITE_BYTE) )
                 return 0;
 
-        if( !(cl=kmalloc(sizeof(*cl), GFP_KERNEL)) )
+        if( !(cl=kzalloc(sizeof(*cl), GFP_KERNEL)) )
                 return -ENOMEM;
-        memset( cl, 0, sizeof(struct i2c_client) );
 
         cl->addr = addr;
         cl->adapter = adapter;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index a0fabf3c2008..7e10c3ab4d50 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -117,10 +117,9 @@ static struct wf_lm75_sensor *wf_lm75_create(struct i2c_adapter *adapter,
         DBG("wf_lm75: creating  %s device at address 0x%02x\n",
             ds1775 ? "ds1775" : "lm75", addr);
 
-        lm = kmalloc(sizeof(struct wf_lm75_sensor), GFP_KERNEL);
+        lm = kzalloc(sizeof(struct wf_lm75_sensor), GFP_KERNEL);
         if (lm == NULL)
                 return NULL;
-        memset(lm, 0, sizeof(struct wf_lm75_sensor));
 
         /* Usual rant about sensor names not beeing very consistent in
          * the device-tree, oh well ...