USB: serial: xr: use subsystem usb_device at probe
authorJohan Hovold <johan@kernel.org>
Thu, 21 Jan 2021 10:29:15 +0000 (11:29 +0100)
committerJohan Hovold <johan@kernel.org>
Tue, 26 Jan 2021 15:16:48 +0000 (16:16 +0100)
Use the subsystem struct usb_device pointer at probe instead of
deriving it from the interface pointer.

Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/xr_serial.c

index 5e110b0c8e71e98591acd04b43fcca3e433a4575..8f81f866d6818d8c4d5ea09fb973f986d54d3e0e 100644 (file)
@@ -541,7 +541,6 @@ static void xr_close(struct usb_serial_port *port)
 
 static int xr_probe(struct usb_serial *serial, const struct usb_device_id *id)
 {
-       struct usb_device *usb_dev = interface_to_usbdev(serial->interface);
        struct usb_driver *driver = serial->type->usb_driver;
        struct usb_interface *control_interface;
        int ret;
@@ -551,7 +550,7 @@ static int xr_probe(struct usb_serial *serial, const struct usb_device_id *id)
                return -ENODEV;
 
        /* But claim the control interface during data interface probe */
-       control_interface = usb_ifnum_to_if(usb_dev, 0);
+       control_interface = usb_ifnum_to_if(serial->dev, 0);
        if (!control_interface)
                return -ENODEV;