iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rt2x00: Introduce separate interface type for PCI-express.

Browse Source 
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>
This commit is contained in:
Gertjan van Wingerde 2010-06-03 10:52:00 +02:00 committed by Ivo van Doorn
parent 785c3c06fb
commit 6e1fdd11b1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/rt2x00/rt2x00.h
View File

@ -160,6 +160,7 @@ struct avg_val {
enum rt2x00_chip_intf { enum rt2x00_chip_intf {
RT2X00_CHIP_INTF_PCI, RT2X00_CHIP_INTF_PCI,
RT2X00_CHIP_INTF_PCIE,
RT2X00_CHIP_INTF_USB, RT2X00_CHIP_INTF_USB,
RT2X00_CHIP_INTF_SOC, RT2X00_CHIP_INTF_SOC,
}; };
@ -980,7 +981,13 @@ static inline bool rt2x00_intf(struct rt2x00_dev *rt2x00dev,
static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev) static inline bool rt2x00_is_pci(struct rt2x00_dev *rt2x00dev)
{ {
return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI) ||
rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
}
static inline bool rt2x00_is_pcie(struct rt2x00_dev *rt2x00dev)
{
return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
} }
static inline bool rt2x00_is_usb(struct rt2x00_dev *rt2x00dev) static inline bool rt2x00_is_usb(struct rt2x00_dev *rt2x00dev)

5
drivers/net/wireless/rt2x00/rt2x00pci.c
View File

@ -351,7 +351,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
rt2x00dev->irq = pci_dev->irq; rt2x00dev->irq = pci_dev->irq;
rt2x00dev->name = pci_name(pci_dev); rt2x00dev->name = pci_name(pci_dev);
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI); if (pci_dev->is_pcie)
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
else
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCI);
retval = rt2x00pci_alloc_reg(rt2x00dev); retval = rt2x00pci_alloc_reg(rt2x00dev);
if (retval) if (retval)