mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-10 15:58:47 +00:00
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>
This commit is contained in:
parent
579082df38
commit
b7b095c154
@ -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 pcix_get_max_mmrbc(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int ret, err, cap;
|
int err, cap;
|
||||||
u32 stat;
|
u32 stat;
|
||||||
|
|
||||||
cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
|
cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
|
||||||
@ -1394,9 +1394,7 @@ int pcix_get_max_mmrbc(struct pci_dev *dev)
|
|||||||
if (err)
|
if (err)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
ret = (stat & PCI_X_STATUS_MAX_READ) >> 12;
|
return (stat & PCI_X_STATUS_MAX_READ) >> 12;
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pcix_get_max_mmrbc);
|
EXPORT_SYMBOL(pcix_get_max_mmrbc);
|
||||||
|
|
||||||
|
@ -633,8 +633,8 @@ static void __init quirk_amd_8131_mmrbc(struct pci_dev *dev)
|
|||||||
|
|
||||||
pci_read_config_byte(dev, PCI_REVISION_ID, &revid);
|
pci_read_config_byte(dev, PCI_REVISION_ID, &revid);
|
||||||
if (dev->subordinate && revid <= 0x12) {
|
if (dev->subordinate && revid <= 0x12) {
|
||||||
printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X MMRBC\n",
|
printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X "
|
||||||
revid);
|
"MMRBC\n", revid);
|
||||||
dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
|
dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user