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

Commit c86fac43 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: resource/PCI: align functions now return start of resource 



This change should be part of b26b2d49

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: default avatarMichal Simek <monstr@monstr.eu>
parent 8a66da71

arch/microblaze/pci/pci-common.c

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



	if (res->flags & IORESOURCE_IO) {

	resource_size_t start = res->start;

	resource_size_t start = res->start;





	if (res->flags & IORESOURCE_IO) {

		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);