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 1bb8799..d9fc1bd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1383,7 +1383,7 @@
*/
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 @@
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 f75ade6..c559085 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -633,8 +633,8 @@
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;
}
}