[PATCH v1 1/2] USB: serial: Drop if with an always false condition

From: Uwe Kleine-König
Date: Mon Feb 08 2021 - 09:47:57 EST


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@xxxxxxxxxxxxxxxxx>
---
drivers/usb/serial/bus.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index eb0195cf37dd..d862ed656414 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -87,15 +87,11 @@ static int usb_serial_device_probe(struct device *dev)
static int usb_serial_device_remove(struct device *dev)
{
struct usb_serial_driver *driver;
- struct usb_serial_port *port;
+ struct usb_serial_port *port = to_usb_serial_port(dev);
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.
*

base-commit: 5c8fe583cce542aa0b84adc939ce85293de36e5e
--
2.29.2