USB: rewrite isd200_init_info for readability

Previously, Coccinelle would issue the following false positive:

isd200.c:1478:14-18: ERROR: reference preceded by free on line 1472

This change rewrites the isd200_init_info function to have more explicit
execution pathways to make it easier for scripts and humans to parse.

Signed-off-by: Kris Borer <kborer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 13 insertions, 17 deletions

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 1bac215202d2..39afd7045c43 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1456,30 +1456,26 @@ static void isd200_free_info_ptrs(void *info_)
  */
 static int isd200_init_info(struct us_data *us)
 {
-        int retStatus = ISD200_GOOD;
         struct isd200_info *info;
 
         info = kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
         if (!info)
-                retStatus = ISD200_ERROR;
-        else {
-                info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
-                info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
-                info->srb.sense_buffer =
-                                kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
-                if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
-                        isd200_free_info_ptrs(info);
-                        kfree(info);
-                        retStatus = ISD200_ERROR;
-                }
-        }
+                return ISD200_ERROR;
 
-        if (retStatus == ISD200_GOOD) {
-                us->extra = info;
-                us->extra_destructor = isd200_free_info_ptrs;
+        info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
+        info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
+        info->srb.sense_buffer = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+
+        if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
+                isd200_free_info_ptrs(info);
+                kfree(info);
+                return ISD200_ERROR;
         }
 
-        return retStatus;
+        us->extra = info;
+        us->extra_destructor = isd200_free_info_ptrs;
+
+        return ISD200_GOOD;
 }
 
 /**************************************************************************