Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andrew Morton and committed by
Greg Kroah-Hartman
b7b095c1 579082df

+4 -6
+2 -4
drivers/pci/pci.c
··· 1383 1383 */ 1384 1384 int pcix_get_max_mmrbc(struct pci_dev *dev) 1385 1385 { 1386 - int ret, err, cap; 1386 + int err, cap; 1387 1387 u32 stat; 1388 1388 1389 1389 cap = pci_find_capability(dev, PCI_CAP_ID_PCIX); ··· 1394 1394 if (err) 1395 1395 return -EINVAL; 1396 1396 1397 - ret = (stat & PCI_X_STATUS_MAX_READ) >> 12; 1398 - 1399 - return ret; 1397 + return (stat & PCI_X_STATUS_MAX_READ) >> 12; 1400 1398 } 1401 1399 EXPORT_SYMBOL(pcix_get_max_mmrbc); 1402 1400
+2 -2
drivers/pci/quirks.c
··· 633 633 634 634 pci_read_config_byte(dev, PCI_REVISION_ID, &revid); 635 635 if (dev->subordinate && revid <= 0x12) { 636 - printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X MMRBC\n", 637 - revid); 636 + printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X " 637 + "MMRBC\n", revid); 638 638 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC; 639 639 } 640 640 }