diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-10-09 14:32:10 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:47:55 -0400 |
commit | 8b45499ccb8a93cd68b1a8766786c2f8ea991ae2 (patch) | |
tree | 49caca5ebfcd56a558cb259ef0799e7f8c647b41 /drivers/ssb | |
parent | 899110fe4e1b26f7a13e639c57e2a047d21bffa2 (diff) |
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')
-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 538c570df33..f1dcd7969a5 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, | |||
551 | might_sleep_if(pdev->id.coreid != SSB_DEV_PCI); | 551 | might_sleep_if(pdev->id.coreid != SSB_DEV_PCI); |
552 | 552 | ||
553 | /* Enable interrupts for this device. */ | 553 | /* Enable interrupts for this device. */ |
554 | if (bus->host_pci && | 554 | if ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE)) { |
555 | ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) { | ||
556 | u32 coremask; | 555 | u32 coremask; |
557 | 556 | ||
558 | /* Calculate the "coremask" for the device. */ | 557 | /* Calculate the "coremask" for the device. */ |
559 | coremask = (1 << dev->core_index); | 558 | coremask = (1 << dev->core_index); |
560 | 559 | ||
560 | SSB_WARN_ON(bus->bustype != SSB_BUSTYPE_PCI); | ||
561 | err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp); | 561 | err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp); |
562 | if (err) | 562 | if (err) |
563 | goto out; | 563 | goto out; |