From: Andrew Morton Cc: "Peter Oruba" Cc: Greg KH Cc: Roland Dreier Signed-off-by: Andrew Morton --- drivers/pci/pci.c | 6 ++---- drivers/pci/quirks.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff -puN drivers/pci/pci.c~pci-x-pci-express-read-control-interfaces-fix drivers/pci/pci.c --- a/drivers/pci/pci.c~pci-x-pci-express-read-control-interfaces-fix +++ a/drivers/pci/pci.c @@ -1403,7 +1403,7 @@ pci_set_consistent_dma_mask(struct pci_d 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); @@ -1414,9 +1414,7 @@ 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 -puN drivers/pci/quirks.c~pci-x-pci-express-read-control-interfaces-fix drivers/pci/quirks.c --- a/drivers/pci/quirks.c~pci-x-pci-express-read-control-interfaces-fix +++ a/drivers/pci/quirks.c @@ -637,9 +637,9 @@ static void __init quirk_amd_8131_mmrbc( 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); - dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC; + printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X " + "MMRBC\n", revid); + dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC; } } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_mmrbc); _