PCI: Kill pci_is_reassigndev()
pci_reassigndev_resource_alignment() is the only user of pci_is_reassigndev(). If we just use pci_specified_resource_alignment() directly, we only need to call it once instead of twice, and we can get rid of pci_is_reassigndev() altogether. No functional change. [bhelgaas: changelog] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Родитель
3ecd9d01f7
Коммит
10c463a7a3
|
@ -3765,18 +3765,6 @@ resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
|
||||||
return align;
|
return align;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* pci_is_reassigndev - check if specified PCI is target device to reassign
|
|
||||||
* @dev: the PCI device to check
|
|
||||||
*
|
|
||||||
* RETURNS: non-zero for PCI device is a target device to reassign,
|
|
||||||
* or zero is not.
|
|
||||||
*/
|
|
||||||
int pci_is_reassigndev(struct pci_dev *dev)
|
|
||||||
{
|
|
||||||
return (pci_specified_resource_alignment(dev) != 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This function disables memory decoding and releases memory resources
|
* This function disables memory decoding and releases memory resources
|
||||||
* of the device specified by kernel's boot parameter 'pci=resource_alignment='.
|
* of the device specified by kernel's boot parameter 'pci=resource_alignment='.
|
||||||
|
@ -3791,7 +3779,9 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
|
||||||
resource_size_t align, size;
|
resource_size_t align, size;
|
||||||
u16 command;
|
u16 command;
|
||||||
|
|
||||||
if (!pci_is_reassigndev(dev))
|
/* check if specified PCI is target device to reassign */
|
||||||
|
align = pci_specified_resource_alignment(dev);
|
||||||
|
if (!align)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
|
if (dev->hdr_type == PCI_HEADER_TYPE_NORMAL &&
|
||||||
|
@ -3807,7 +3797,6 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
|
||||||
command &= ~PCI_COMMAND_MEMORY;
|
command &= ~PCI_COMMAND_MEMORY;
|
||||||
pci_write_config_word(dev, PCI_COMMAND, command);
|
pci_write_config_word(dev, PCI_COMMAND, command);
|
||||||
|
|
||||||
align = pci_specified_resource_alignment(dev);
|
|
||||||
for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
|
for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
|
||||||
r = &dev->resource[i];
|
r = &dev->resource[i];
|
||||||
if (!(r->flags & IORESOURCE_MEM))
|
if (!(r->flags & IORESOURCE_MEM))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче