On Thu, 2015-08-10 at 21:39:10 UTC, Yinghai Lu wrote:
> There are powerpc generic version and x86 local version for
> skip_ioresource_align().
>
> Move the powerpc version to setup-bus.c, and kill x86 local version.
>
> Also kill dummy version in microblaze.
>
> Cc: Michal Simek <monstr@xxxxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> Cc: Arnd Bergmann <arnd@xxxxxxxx>
> Cc: linuxppc-dev@xxxxxxxxxxxxxxxx
> Cc: linux-arch@xxxxxxxxxxxxxxx
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
>
> diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> index 7587b2a..8853667 100644
> --- a/arch/powerpc/kernel/pci-common.c
> +++ b/arch/powerpc/kernel/pci-common.c
> @@ -1052,15 +1052,6 @@ void pci_fixup_cardbus(struct pci_bus *bus)
> pcibios_setup_bus_devices(bus);
> }
>
> -
> -static int skip_isa_ioresource_align(struct pci_dev *dev)
> -{
> - if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
> - !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
> - return 1;
> - return 0;
> -}
> -
> /*
> * We need to avoid collisions with `mirrored' VGA ports
> * and other strange ISA hardware, so we always want the
> @@ -1081,7 +1072,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
> resource_size_t start = res->start;
>
> if (res->flags & IORESOURCE_IO) {
> - if (skip_isa_ioresource_align(dev))
> + if (skip_isa_ioresource_align(dev->bus))
> return start;
> if (start & 0x300)
> start = (start + 0x3ff) & ~0x3ff;
LGTM.
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> (powerpc)
cheers
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
