diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-10-09 20:32:10 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:47:55 -0400 |
commit | 8b45499ccb8a93cd68b1a8766786c2f8ea991ae2 (patch) | |
tree | 49caca5ebfcd56a558cb259ef0799e7f8c647b41 /drivers/ssb/driver_pcicore.c | |
parent | 899110fe4e1b26f7a13e639c57e2a047d21bffa2 (diff) | |
download | linux-stable-8b45499ccb8a93cd68b1a8766786c2f8ea991ae2.tar.gz linux-stable-8b45499ccb8a93cd68b1a8766786c2f8ea991ae2.tar.bz2 linux-stable-8b45499ccb8a93cd68b1a8766786c2f8ea991ae2.zip |
ssb: Put host pointers into a union
This slightly shrinks the structure.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/driver_pcicore.c')
-rw-r--r-- | drivers/ssb/driver_pcicore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 538c570df337..f1dcd7969a5c 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -551,13 +551,13 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc, might_sleep_if(pdev->id.coreid != SSB_DEV_PCI); /* Enable interrupts for this device. */ - if (bus->host_pci && - ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) { + if ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE)) { u32 coremask; /* Calculate the "coremask" for the device. */ coremask = (1 << dev->core_index); + SSB_WARN_ON(bus->bustype != SSB_BUSTYPE_PCI); err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp); if (err) goto out; |