1 files changed, 12 insertions, 17 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 502732ac270d..bea9d659af15 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -949,16 +949,14 @@ static int adpt_install_hba(struct pci_dev* pDev)
         }
         
         // Allocate and zero the data structure
-        pHba = kmalloc(sizeof(adpt_hba), GFP_KERNEL);
-        if( pHba == NULL) {
-                if(msg_addr_virt != base_addr_virt){
+        pHba = kzalloc(sizeof(adpt_hba), GFP_KERNEL);
+        if (!pHba) {
+                if (msg_addr_virt != base_addr_virt)
                         iounmap(msg_addr_virt);
-                }
                 iounmap(base_addr_virt);
                 pci_release_regions(pDev);
                 return -ENOMEM;
         }
-        memset(pHba, 0, sizeof(adpt_hba));
 
         mutex_lock(&adpt_configuration_lock);
 
@@ -2622,14 +2620,13 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
 
         msg=(u32 __iomem *)(pHba->msg_addr_virt+m);
 
-        status = kmalloc(4,GFP_KERNEL|ADDR32);
-        if (status==NULL) {
+        status = kzalloc(4, GFP_KERNEL|ADDR32);
+        if (!status) {
                 adpt_send_nop(pHba, m);
                 printk(KERN_WARNING"%s: IOP reset failed - no free memory.\n",
                         pHba->name);
                 return -ENOMEM;
         }
-        memset(status, 0, 4);
 
         writel(EIGHT_WORD_MSG_SIZE| SGL_OFFSET_6, &msg[0]);
         writel(I2O_CMD_OUTBOUND_INIT<<24 | HOST_TID<<12 | ADAPTER_TID, &msg[1]);
@@ -2668,12 +2665,11 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
 
         kfree(pHba->reply_pool);
 
-        pHba->reply_pool = kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
-        if(!pHba->reply_pool){
-                printk(KERN_ERR"%s: Could not allocate reply pool\n",pHba->name);
-                return -1;
+        pHba->reply_pool = kzalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
+        if (!pHba->reply_pool) {
+                printk(KERN_ERR "%s: Could not allocate reply pool\n", pHba->name);
+                return -ENOMEM;
         }
-        memset(pHba->reply_pool, 0 , pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4);
 
         ptr = pHba->reply_pool;
         for(i = 0; i < pHba->reply_fifo_size; i++) {
@@ -2884,12 +2880,11 @@ static int adpt_i2o_build_sys_table(void)
 
         kfree(sys_tbl);
 
-        sys_tbl = kmalloc(sys_tbl_len, GFP_KERNEL|ADDR32);
-        if(!sys_tbl) {
+        sys_tbl = kzalloc(sys_tbl_len, GFP_KERNEL|ADDR32);
+        if (!sys_tbl) {
                 printk(KERN_WARNING "SysTab Set failed. Out of memory.\n");     
                 return -ENOMEM;
         }
-        memset(sys_tbl, 0, sys_tbl_len);
 
         sys_tbl->num_entries = hba_count;
         sys_tbl->version = I2OVERSION;
@@ -3351,7 +3346,7 @@ static int __init adpt_init(void)
         return count > 0 ? 0 : -ENODEV;
 }
 
-static void __exit adpt_exit(void)
+static void adpt_exit(void)
 {
         while (hba_chain)
                 adpt_release(hba_chain);