staging: unisys: kmalloc/memset to kzalloc conversation

This patch solves the Coccinelle warning: "kzalloc should be used
instead of kmalloc/memset"

This patch is a fixup for

	linux-next: 97a84f1203786985856a0d4b49b1d7cc387238ce
	"Staging: unisys: Replace kmalloc/memset with kzalloc"

The ALLOC_CMDRSP #define is after transformation to kzalloc only a
rename for kzalloc and was completly removed.

Signed-off-by: Silvio F <silvio.fricke@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5 files changed, 9 insertions, 20 deletions

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 81b5d9baea5c..effd8935e81b 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -189,13 +189,6 @@ struct chaninfo {
         schedule_timeout((x)*HZ); \
 }
 
-#define ALLOC_CMDRSP(cmdrsp) { \
-        cmdrsp = kmalloc(SIZEOF_CMDRSP, GFP_ATOMIC); \
-        if (cmdrsp != NULL) { \
-                memset(cmdrsp, 0, SIZEOF_CMDRSP); \
-        } \
-}
-
 /* This is a hack until we fix IOVM to initialize the channel header
  * correctly at DEVICE_CREATE time, INSTEAD OF waiting until
  * DEVICE_CONFIGURE time.
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 8aefaa8d36bf..817b11dfa19c 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -402,9 +402,8 @@ process_disk_notify(struct Scsi_Host *shost, struct uiscmdrsp *cmdrsp)
         struct diskaddremove *dar;
         unsigned long flags;
 
-        dar = kmalloc(sizeof(struct diskaddremove), GFP_ATOMIC);
+        dar = kzalloc(sizeof(struct diskaddremove), GFP_ATOMIC);
         if (dar) {
-                memset(dar, 0, sizeof(struct diskaddremove));
                 dar->add = cmdrsp->disknotify.add;
                 dar->shost = shost;
                 dar->channel = cmdrsp->disknotify.channel;
@@ -697,7 +696,7 @@ forward_vdiskmgmt_command(VDISK_MGMT_TYPES vdiskcmdtype,
                 return FAILED;
         }
 
-        ALLOC_CMDRSP(cmdrsp);
+        cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
         if (cmdrsp == NULL) {
                 LOGERR("kmalloc of cmdrsp failed.\n");
                 return FAILED;  /* reject */
@@ -759,7 +758,7 @@ forward_taskmgmt_command(TASK_MGMT_TYPES tasktype, struct scsi_device *scsidev)
                 return FAILED;
         }
 
-        ALLOC_CMDRSP(cmdrsp);
+        cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
         if (cmdrsp == NULL) {
                 LOGERR("kmalloc of cmdrsp failed.\n");
                 return FAILED;  /* reject */
@@ -930,7 +929,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
                 return SCSI_MLQUEUE_DEVICE_BUSY;
         }
 
-        ALLOC_CMDRSP(cmdrsp);
+        cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
         if (cmdrsp == NULL) {
                 LOGERR("kmalloc of cmdrsp failed.\n");
                 return 1;       /* reject the command */
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 1b646328839e..8e34650b00b5 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -254,13 +254,12 @@ static int add_vbus(struct add_vbus_guestpart *addparams)
 {
         int ret;
         struct device *vbus;
-        vbus = kmalloc(sizeof(struct device), GFP_ATOMIC);
+        vbus = kzalloc(sizeof(struct device), GFP_ATOMIC);
 
         POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
         if (!vbus)
                 return 0;
 
-        memset(vbus, 0, sizeof(struct device));
         dev_set_name(vbus, "vbus%d", addparams->busNo);
         vbus->release = virtpci_bus_release;
         vbus->parent = &virtpci_rootbus_device; /* root bus is parent */
diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c
index 82c651d27396..b9b61e8a8e71 100644
--- a/drivers/staging/unisys/visorutil/memregion_direct.c
+++ b/drivers/staging/unisys/visorutil/memregion_direct.c
@@ -41,13 +41,12 @@ MEMREGION *
 visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes)
 {
         MEMREGION *rc = NULL;
-        MEMREGION *memregion = kmalloc(sizeof(MEMREGION),
-                                       GFP_KERNEL|__GFP_NORETRY);
+        MEMREGION *memregion = kzalloc(sizeof(MEMREGION),
+                                       GFP_KERNEL | __GFP_NORETRY);
         if (memregion == NULL) {
                 ERRDRV("visor_memregion_create allocation failed");
                 return NULL;
         }
-        memset(memregion, 0, sizeof(MEMREGION));
         memregion->physaddr = physaddr;
         memregion->nbytes = nbytes;
         memregion->overlapped = FALSE;
diff --git a/drivers/staging/unisys/visorutil/periodic_work.c b/drivers/staging/unisys/visorutil/periodic_work.c
index cc1c678a3b03..fb1e894ebdc1 100644
--- a/drivers/staging/unisys/visorutil/periodic_work.c
+++ b/drivers/staging/unisys/visorutil/periodic_work.c
@@ -56,13 +56,12 @@ PERIODIC_WORK *visor_periodic_work_create(ulong jiffy_interval,
                                           void *workfuncarg,
                                           const char *devnam)
 {
-        PERIODIC_WORK *periodic_work = kmalloc(sizeof(PERIODIC_WORK),
-                                               GFP_KERNEL|__GFP_NORETRY);
+        PERIODIC_WORK *periodic_work = kzalloc(sizeof(PERIODIC_WORK),
+                                               GFP_KERNEL | __GFP_NORETRY);
         if (periodic_work == NULL) {
                 ERRDRV("periodic_work allocation failed ");
                 return NULL;
         }
-        memset(periodic_work, '\0', sizeof(PERIODIC_WORK));
         rwlock_init(&periodic_work->lock);
         periodic_work->jiffy_interval = jiffy_interval;
         periodic_work->workqueue = workqueue;