[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>

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)
 int
 pci_enable_device(struct pci_dev *dev)
 {
-        int err;
-
-        if ((err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1)))
+        int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
+        if (err)
                 return err;
         pci_fixup_device(pci_fixup_enable, dev);
         dev->is_enabled = 1;