PCI: pci-x-pci-express-read-control-interfaces cleanups

- remove unneeded local

- 80-col fix

Cc: Peter Oruba <peter.oruba@amd.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1bb879959a20998137728259e0a43ac09d42df8c..d9fc1bd1f3e84adfd8f141f137ef6cf0179e6fa2 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1383,7 +1383,7 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
  */
 int pcix_get_max_mmrbc(struct pci_dev *dev)
 {
-       int ret, err, cap;
+       int err, cap;
        u32 stat;
 
        cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
@@ -1394,9 +1394,7 @@ int pcix_get_max_mmrbc(struct pci_dev *dev)
        if (err)
                return -EINVAL;
 
-       ret = (stat & PCI_X_STATUS_MAX_READ) >> 12;
-
-       return ret;
+       return (stat & PCI_X_STATUS_MAX_READ) >> 12;
 }
 EXPORT_SYMBOL(pcix_get_max_mmrbc);
 

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f75ade6f06027ff528e2b2c35629f7541345ad6f..c559085c89a50f2c0ee909191c2ef0b0ea549f66 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -633,8 +633,8 @@ static void __init quirk_amd_8131_mmrbc(struct pci_dev *dev)
 
        pci_read_config_byte(dev, PCI_REVISION_ID, &revid);
        if (dev->subordinate && revid <= 0x12) {
-               printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X MMRBC\n",
-                       revid);
+               printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X "
+                               "MMRBC\n", revid);
                dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
        }
 }