Staging: asus_oled: Add defines for asus vendor_id and device_id to be consistent...
authorPeter Huewe <peterhuewe@gmx.de>
Tue, 15 Dec 2009 04:04:22 +0000 (05:04 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:29 +0000 (16:42 -0800)
This almost trivial patch replaces the hardcoded values for the vendor and
device ids with defines, as they are used in drivers/hid/hid-ids.h

For me this seems to be more consistent, however as drivers/hid/hid-ids.h
is not within the default include directory I had to redefine the defines here
(maybe move the hid-ids.h to include/linux ?)

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/asus_oled/asus_oled.c

index 43c57b7688abe658223c49834c56f6fb0be6d180..0c1fb0d618a5ab190d8bf3139ffcd52c7848d548 100644 (file)
 #define ASUS_OLED_DISP_HEIGHT          32
 #define ASUS_OLED_PACKET_BUF_SIZE      256
 
+#define USB_VENDOR_ID_ASUS      0x0b05
+#define USB_DEVICE_ID_ASUS_LCM      0x1726
+#define USB_DEVICE_ID_ASUS_LCM2     0x175b
+
 MODULE_AUTHOR("Jakub Schmidtke, sjakub@gmail.com");
 MODULE_DESCRIPTION("Asus OLED Driver v" ASUS_OLED_VERSION);
 MODULE_LICENSE("GPL");
@@ -85,16 +89,18 @@ struct oled_dev_desc_str {
 /* table of devices that work with this driver */
 static struct usb_device_id id_table[] = {
        /* Asus G1/G2 (and variants)*/
-       { USB_DEVICE(0x0b05, 0x1726) },
+       { USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM) },
        /* Asus G50V (and possibly others - G70? G71?)*/
-       { USB_DEVICE(0x0b05, 0x175b) },
+       { USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2) },
        { },
 };
 
 /* parameters of specific devices */
 static struct oled_dev_desc_str oled_dev_desc_table[] = {
-       { 0x0b05, 0x1726, 128, PACK_MODE_G1, "G1/G2" },
-       { 0x0b05, 0x175b, 256, PACK_MODE_G50, "G50" },
+       { USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, 128, PACK_MODE_G1,
+               "G1/G2" },
+       { USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2, 256, PACK_MODE_G50,
+               "G50" },
        { },
 };