aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorGrant Grundler <grundler@parisc-linux.org>2006-01-14 02:34:53 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 17:35:10 -0500
commitb64c05e7de6071694dd6840eac9724a006ee19f8 (patch)
treeb611e32ceeaa0de2782334fe88a204dfe97e6017 /drivers/pci/pci.c
parentb0e6e962992b76580f4900b166a337bad7c1e81b (diff)
[PATCH] PCI: clean up msi.c a bit
Clean up: move assignments outside of if() statements. AFAICT, no functional change. Easier to read/understand. Depends on "[PATCH 1/3] msi vector targeting abstractions" by Mark Maule <maule@sgi.com>. I expect one hunk to fail if applied against 2.6.15. This is essentially Joe Perches' patch. I've cleaned up the one instance added by Mark's patch. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d2d187916643..e17cd49d6244 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -495,9 +495,8 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
495int 495int
496pci_enable_device(struct pci_dev *dev) 496pci_enable_device(struct pci_dev *dev)
497{ 497{
498 int err; 498 int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
499 499 if (err)
500 if ((err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1)))
501 return err; 500 return err;
502 pci_fixup_device(pci_fixup_enable, dev); 501 pci_fixup_device(pci_fixup_enable, dev);
503 dev->is_enabled = 1; 502 dev->is_enabled = 1;