[PATCH 03/10] USB: serial: xr: use subsystem usb_device at probe

From: Johan Hovold
Date: Thu Jan 21 2021 - 05:35:54 EST


Use the subsystem struct usb_device pointer at probe instead of
deriving it from the interface pointer.

Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
---
drivers/usb/serial/xr_serial.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c
index 5e110b0c8e71..8f81f866d681 100644
--- a/drivers/usb/serial/xr_serial.c
+++ b/drivers/usb/serial/xr_serial.c
@@ -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;

--
2.26.2