USB: core: rename usb_driver_claim_interface() data parameter

It's been almost twenty years since the interface "private data" pointer
was removed in favour of using the driver-data pointer of struct device.

Let's rename the driver-data parameter of usb_driver_claim_interface()
so that it better reflects how it's used.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210318155406.22399-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index a1013d9da08dd0c68a14d3a1027dd507c49513b7..072968c40adeaaf204a68589c0ca2d8660adb5b7 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -519,7 +519,7 @@ static int usb_unbind_interface(struct device *dev)
  * @driver: the driver to be bound
  * @iface: the interface to which it will be bound; must be in the
  *     usb device's active configuration
- * @priv: driver data associated with that interface
+ * @data: driver data associated with that interface
  *
  * This is used by usb device drivers that need to claim more than one
  * interface on a device when probing (audio and acm are current examples).
@@ -533,7 +533,7 @@ static int usb_unbind_interface(struct device *dev)
  * Return: 0 on success.
  */
 int usb_driver_claim_interface(struct usb_driver *driver,
-                               struct usb_interface *iface, void *priv)
+                               struct usb_interface *iface, void *data)
 {
        struct device *dev;
        int retval = 0;
@@ -550,7 +550,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
                return -ENODEV;
 
        dev->driver = &driver->drvwrap.driver;
-       usb_set_intfdata(iface, priv);
+       usb_set_intfdata(iface, data);
        iface->needs_binding = 0;
 
        iface->condition = USB_INTERFACE_BOUND;

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 57c1e0ce5eba416311ef9542a959b8fd415c8371..b07e90d07ab61d3116bbede5535fec69e24de2c1 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -841,7 +841,7 @@ extern int usb_free_streams(struct usb_interface *interface,
 
 /* used these for multi-interface device registration */
 extern int usb_driver_claim_interface(struct usb_driver *driver,
-                       struct usb_interface *iface, void *priv);
+                       struct usb_interface *iface, void *data);
 
 /**
  * usb_interface_claimed - returns true iff an interface is claimed