From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 20 Jan 2015 07:40:51 +0000 (+0100)
Subject: ALSA: line6: Yet more cleanup of superfluous NULL checks
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=270fd9c7f91fe8be900ede740ceeaa4abefa5d98;p=linux-beck.git

ALSA: line6: Yet more cleanup of superfluous NULL checks

... in line6_disconnect() as well.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 93cd4daa56bc..e8d51381ffdb 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -579,18 +579,9 @@ EXPORT_SYMBOL_GPL(line6_probe);
 */
 void line6_disconnect(struct usb_interface *interface)
 {
-	struct usb_line6 *line6;
-	struct usb_device *usbdev;
-	int interface_number;
-
-	if (interface == NULL)
-		return;
-	usbdev = interface_to_usbdev(interface);
-	if (usbdev == NULL)
-		return;
+	struct usb_line6 *line6 = usb_get_intfdata(interface);
+	struct usb_device *usbdev = interface_to_usbdev(interface);
 
-	interface_number = interface->cur_altsetting->desc.bInterfaceNumber;
-	line6 = usb_get_intfdata(interface);
 	if (!line6)
 		return;