[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 <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
git-mirror · Jun 11, 2007 · 66fcc55 · 66fcc55
1 parent 7b1d5c0
commit 66fcc55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git 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
@@ -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