Commit 6e1fdd11 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by Ivo van Doorn

rt2x00: Introduce separate interface type for PCI-express.

Needed later for PCI-express specific code in rt2800pci.
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
parent 785c3c06
...@@ -160,6 +160,7 @@ struct avg_val { ...@@ -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, ...@@ -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)
......
...@@ -351,7 +351,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment