]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: most: hdm-usb: rename ID_INIC for consistency
authorChristian Gromm <christian.gromm@microchip.com>
Fri, 19 Aug 2016 09:12:50 +0000 (11:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Aug 2016 14:53:56 +0000 (16:53 +0200)
In order to have a consistent naming convention this patch renames
USB_DEV_ID_INIC to USB_DEV_ID_OS81118.

Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/most/hdm-usb/hdm_usb.c

index beb50cddb8eef96687eb7c17d2e5aa65df80ec90..c2ba5a1834c6d10e40649dbf327c23d2ca36a249 100644 (file)
@@ -43,7 +43,7 @@
 
 #define USB_VENDOR_ID_SMSC     0x0424  /* VID: SMSC */
 #define USB_DEV_ID_BRDG                0xC001  /* PID: USB Bridge */
-#define USB_DEV_ID_INIC                0xCF18  /* PID: USB INIC */
+#define USB_DEV_ID_OS81118     0xCF18  /* PID: USB OS81118 */
 #define USB_DEV_ID_OS81119     0xCF19  /* PID: USB OS81119 */
 /* DRCI Addresses */
 #define DRCI_REG_NI_STATE      0x0100
@@ -954,7 +954,7 @@ static const struct file_operations hdm_usb_fops = {
  */
 static struct usb_device_id usbid[] = {
        { USB_DEVICE(USB_VENDOR_ID_SMSC, USB_DEV_ID_BRDG), },
-       { USB_DEVICE(USB_VENDOR_ID_SMSC, USB_DEV_ID_INIC), },
+       { USB_DEVICE(USB_VENDOR_ID_SMSC, USB_DEV_ID_OS81118), },
        { USB_DEVICE(USB_VENDOR_ID_SMSC, USB_DEV_ID_OS81119), },
        { } /* Terminating entry */
 };
@@ -1329,7 +1329,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
        }
 
        mutex_lock(&mdev->io_mutex);
-       if (le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_INIC ||
+       if (le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81118 ||
            le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81119) {
                /* this increments the reference count of the instance
                 * object of the core