mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
staging: most: hdm-usb: rename ID_INIC for consistency
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>
This commit is contained in:
parent
b50762eaf8
commit
654f7ec4b3
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue