From 270fd9c7f91fe8be900ede740ceeaa4abefa5d98 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 20 Jan 2015 08:40:51 +0100 Subject: [PATCH] ALSA: line6: Yet more cleanup of superfluous NULL checks ... in line6_disconnect() as well. Tested-by: Chris Rorvick Signed-off-by: Takashi Iwai --- sound/usb/line6/driver.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) 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; -- 2.20.1