USB: serial: drop if with an always false condition
authorUwe Kleine-König <uwe@kleine-koenig.org>
Mon, 8 Feb 2021 14:31:48 +0000 (15:31 +0100)
committerJohan Hovold <johan@kernel.org>
Tue, 9 Feb 2021 12:13:16 +0000 (13:13 +0100)
In a bus remove function the passed device is always valid, so there is
no need to check for it being NULL.

(Side note: The check for port being non-NULL is broken anyhow, because
to_usb_serial_port() is a wrapper around container_of() for a member that is
not the first one. So port can hardly become NULL.)

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20210208143149.963644-1-uwe@kleine-koenig.org
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/bus.c

index eb0195c..58206ef 100644 (file)
@@ -86,16 +86,12 @@ err_autopm_put:
 
 static int usb_serial_device_remove(struct device *dev)
 {
+       struct usb_serial_port *port = to_usb_serial_port(dev);
        struct usb_serial_driver *driver;
-       struct usb_serial_port *port;
        int retval = 0;
        int minor;
        int autopm_err;
 
-       port = to_usb_serial_port(dev);
-       if (!port)
-               return -ENODEV;
-
        /*
         * Make sure suspend/resume doesn't race against port_remove.
         *