mirror of https://gitee.com/openkylin/linux.git
microblaze: resource/PCI: align functions now return start of resource
This change should be part of b26b2d494b
Origin description:
resource/PCI: align functions now return start of resource
As suggested by Linus, align functions should return the start
of a resource, not void. An update of "res->start" is no longer
necessary.
Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
parent
8a66da71fa
commit
c86fac4382
|
@ -1131,21 +1131,20 @@ static int skip_isa_ioresource_align(struct pci_dev *dev)
|
||||||
* but we want to try to avoid allocating at 0x2900-0x2bff
|
* but we want to try to avoid allocating at 0x2900-0x2bff
|
||||||
* which might have be mirrored at 0x0100-0x03ff..
|
* which might have be mirrored at 0x0100-0x03ff..
|
||||||
*/
|
*/
|
||||||
void pcibios_align_resource(void *data, struct resource *res,
|
resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
||||||
resource_size_t size, resource_size_t align)
|
resource_size_t size, resource_size_t align)
|
||||||
{
|
{
|
||||||
struct pci_dev *dev = data;
|
struct pci_dev *dev = data;
|
||||||
|
resource_size_t start = res->start;
|
||||||
|
|
||||||
if (res->flags & IORESOURCE_IO) {
|
if (res->flags & IORESOURCE_IO) {
|
||||||
resource_size_t start = res->start;
|
|
||||||
|
|
||||||
if (skip_isa_ioresource_align(dev))
|
if (skip_isa_ioresource_align(dev))
|
||||||
return;
|
return start;
|
||||||
if (start & 0x300) {
|
if (start & 0x300)
|
||||||
start = (start + 0x3ff) & ~0x3ff;
|
start = (start + 0x3ff) & ~0x3ff;
|
||||||
res->start = start;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return start;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pcibios_align_resource);
|
EXPORT_SYMBOL(pcibios_align_resource);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue