ALSA: line6: Remove superfluous NULL checks in each driver
The interface and driver objects are always set when callbacks are
called. Drop such superfluous NULL checks in init and disconnect
calls of each driver.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index bf027fc..26ecf26 100644
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -401,25 +401,16 @@
*/
static void line6_pod_disconnect(struct usb_interface *interface)
{
- struct usb_line6_pod *pod;
+ struct usb_line6_pod *pod = usb_get_intfdata(interface);
+ struct device *dev = &interface->dev;
- if (interface == NULL)
- return;
- pod = usb_get_intfdata(interface);
+ /* remove sysfs entries: */
+ device_remove_file(dev, &dev_attr_device_id);
+ device_remove_file(dev, &dev_attr_firmware_version);
+ device_remove_file(dev, &dev_attr_serial_number);
- if (pod != NULL) {
- struct device *dev = &interface->dev;
-
- if (dev != NULL) {
- /* remove sysfs entries: */
- device_remove_file(dev, &dev_attr_device_id);
- device_remove_file(dev, &dev_attr_firmware_version);
- device_remove_file(dev, &dev_attr_serial_number);
- }
-
- del_timer_sync(&pod->startup_timer);
- cancel_work_sync(&pod->startup_work);
- }
+ del_timer_sync(&pod->startup_timer);
+ cancel_work_sync(&pod->startup_work);
}
/*
@@ -456,9 +447,6 @@
init_timer(&pod->startup_timer);
INIT_WORK(&pod->startup_work, pod_startup4);
- if ((interface == NULL) || (pod == NULL))
- return -ENODEV;
-
/* create sysfs entries: */
err = pod_create_files2(&interface->dev);
if (err < 0)