From: Holger Schurig Date: Fri, 25 May 2007 04:11:58 +0000 (-0400) Subject: [PATCH] libertas: move vendor & product id's into if_usb.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66fcc559042d85d57d9856d2a7fbcaa3e827a58c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [PATCH] libertas: move vendor & product id's into if_usb.c For me it looks cleaner, because it removes one level of indirection. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 6bc78bb8d1a2..38063de9da43 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -19,12 +19,8 @@ static const char usbdriver_name[] = "usb8xxx"; static struct usb_device_id if_usb_table[] = { /* Enter the device signature inside */ - { - USB_DEVICE(USB8388_VID_1, USB8388_PID_1), - }, - { - USB_DEVICE(USB8388_VID_2, USB8388_PID_2), - }, + { USB_DEVICE(0x1286, 0x2001) }, + { USB_DEVICE(0x05a3, 0x8388) }, {} /* Terminating entry */ }; diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h index 170dfe6809f5..e994d75c5250 100644 --- a/drivers/net/wireless/libertas/if_usb.h +++ b/drivers/net/wireless/libertas/if_usb.h @@ -7,11 +7,6 @@ #define IPFIELD_ALIGN_OFFSET 2 -#define USB8388_VID_1 0x1286 -#define USB8388_PID_1 0x2001 -#define USB8388_VID_2 0x05a3 -#define USB8388_PID_2 0x8388 - #define BOOT_CMD_FW_BY_USB 0x01 #define BOOT_CMD_FW_IN_EEPROM 0x02 #define BOOT_CMD_UPDATE_BOOT2 0x03