diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2010-06-03 04:52:00 -0400 |
---|---|---|
committer | Ivo van Doorn <IvDoorn@gmail.com> | 2010-06-03 04:52:00 -0400 |
commit | 6e1fdd11b1b3febca3554dbca5f6a80ba0a7c285 (patch) | |
tree | 92f5f26409ab63a5da775ce05e0e2cf893473a74 /drivers/net/wireless/rt2x00 | |
parent | 785c3c06fb8f4bc3a8bb6ff39e8f6a70f889bde9 (diff) |
rt2x00: Introduce separate interface type for PCI-express.
Needed later for PCI-express specific code in rt2800pci.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 9fc3612dd182..e7acc6abfd89 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -160,6 +160,7 @@ struct avg_val { | |||
160 | 160 | ||
161 | enum rt2x00_chip_intf { | 161 | enum rt2x00_chip_intf { |
162 | RT2X00_CHIP_INTF_PCI, | 162 | RT2X00_CHIP_INTF_PCI, |
163 | RT2X00_CHIP_INTF_PCIE, | ||
163 | RT2X00_CHIP_INTF_USB, | 164 | RT2X00_CHIP_INTF_USB, |
164 | RT2X00_CHIP_INTF_SOC, | 165 | RT2X00_CHIP_INTF_SOC, |
165 | }; | 166 | }; |
@@ -980,7 +981,13 @@ static inline bool rt2x00_intf(struct rt2x00_dev *rt2x00dev, | |||
980 | 981 | ||
981 | static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev) | 982 | static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev) |
982 | { | 983 | { |
983 | return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); | 984 | return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI) || |
985 | rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE); | ||
986 | } | ||
987 | |||
988 | static inline bool rt2x00_is_pcie(struct rt2x00_dev *rt2x00dev) | ||
989 | { | ||
990 | return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE); | ||
984 | } | 991 | } |
985 | 992 | ||
986 | static inline bool rt2x00_is_usb(struct rt2x00_dev *rt2x00dev) | 993 | static inline bool rt2x00_is_usb(struct rt2x00_dev *rt2x00dev) |
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index d583ee070b47..10eaffd12b1b 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
@@ -351,7 +351,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) | |||
351 | rt2x00dev->irq = pci_dev->irq; | 351 | rt2x00dev->irq = pci_dev->irq; |
352 | rt2x00dev->name = pci_name(pci_dev); | 352 | rt2x00dev->name = pci_name(pci_dev); |
353 | 353 | ||
354 | rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); | 354 | if (pci_dev->is_pcie) |
355 | rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE); | ||
356 | else | ||
357 | rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); | ||
355 | 358 | ||
356 | retval = rt2x00pci_alloc_reg(rt2x00dev); | 359 | retval = rt2x00pci_alloc_reg(rt2x00dev); |
357 | if (retval) | 360 | if (retval) |