Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7b095c1 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 579082df

drivers/pci/pci.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/pci/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

}