Browse Source

usb: misc: ftdi-elan: Simplify return statement

Replace redundant variable use in return statement.

Signed-off-by: Saurabh Karajgaonkar <skarajga@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Saurabh Karajgaonkar 10 years ago
parent
commit
a53870c0eb
1 changed files with 2 additions and 10 deletions
  1. 2 10
      drivers/usb/misc/ftdi-elan.c

+ 2 - 10
drivers/usb/misc/ftdi-elan.c

@@ -2568,11 +2568,7 @@ static int ftdi_elan_close_controller(struct usb_ftdi *ftdi, int fn)
 					    0x00);
 					    0x00);
 	if (UxxxStatus)
 	if (UxxxStatus)
 		return UxxxStatus;
 		return UxxxStatus;
-	UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
-					   &pcidata);
-	if (UxxxStatus)
-		return UxxxStatus;
-	return 0;
+	return ftdi_elan_read_config(ftdi, activePCIfn | reg, 0, &pcidata);
 }
 }
 
 
 static int ftdi_elan_found_controller(struct usb_ftdi *ftdi, int fn, int quirk)
 static int ftdi_elan_found_controller(struct usb_ftdi *ftdi, int fn, int quirk)
@@ -2695,11 +2691,7 @@ static int ftdi_elan_setupOHCI(struct usb_ftdi *ftdi)
 		}
 		}
 	}
 	}
 	if (ftdi->function > 0) {
 	if (ftdi->function > 0) {
-		UxxxStatus = ftdi_elan_setup_controller(ftdi,
-							ftdi->function - 1);
-		if (UxxxStatus)
-			return UxxxStatus;
-		return 0;
+		return ftdi_elan_setup_controller(ftdi,	ftdi->function - 1);
 	} else if (controllers > 0) {
 	} else if (controllers > 0) {
 		return -ENXIO;
 		return -ENXIO;
 	} else if (unrecognized > 0) {
 	} else if (unrecognized > 0) {