diff options
| author |   Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-08-02 00:43:13 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 18:28:39 -0700 |
| commit | 100ca122870844d6c001d5d0532b885c707b6ea9 (patch) | |
| tree | ab7e8db40d2c79ebe38d14f321f3830fa9c711a4 /drivers/staging | |
| parent | Staging: comedi : fix brace coding style issue in wwrap.c (diff) | |
| download | linux-dev-100ca122870844d6c001d5d0532b885c707b6ea9.tar.xz linux-dev-100ca122870844d6c001d5d0532b885c707b6ea9.zip | |
Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name format
There is a common name format for PCI_VENDOR/DEVICE_ID constants.
wlags49_h2 names doesn't fit in the standard.
This patch change the names and also fix some style issues.
Thanks a lot,
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 10 | ||||
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.h | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index af4f4f80a002..020b17adee2d 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -117,9 +117,13 @@ enum hermes_pci_versions { }; static struct pci_device_id wl_pci_tbl[] __devinitdata = { - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { } /* Terminating entry */ }; diff --git a/drivers/staging/wlags49_h2/wl_pci.h b/drivers/staging/wlags49_h2/wl_pci.h index 18d7b514ea6c..cea04c44ec47 100644 --- a/drivers/staging/wlags49_h2/wl_pci.h +++ b/drivers/staging/wlags49_h2/wl_pci.h @@ -67,10 +67,10 @@ /******************************************************************************* * constant definitions ******************************************************************************/ -#define WL_LKM_PCI_VENDOR_ID 0x11C1 // Lucent Microelectronics -#define WL_LKM_PCI_DEVICE_ID_0 0xAB30 // Mini PCI -#define WL_LKM_PCI_DEVICE_ID_1 0xAB34 // Mini PCI -#define WL_LKM_PCI_DEVICE_ID_2 0xAB11 // WARP CardBus +#define PCI_VENDOR_IDWL_LKM 0x11C1 /* Lucent Microelectronics */ +#define PCI_DEVICE_ID_WL_LKM_0 0xAB30 /* Mini PCI */ +#define PCI_DEVICE_ID_WL_LKM_1 0xAB34 /* Mini PCI */ +#define PCI_DEVICE_ID_WL_LKM_2 0xAB11 /* WARP CardBus */ |