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

Commit 629a8581 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

parisc: switch to GENERIC_PCI_IOMAP 



parisc copied pci_iomap from generic code, probably to avoid
pulling the rest of iomap.c in.  Since that's in
a separate file now, we can reuse the common implementation.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent eab90291

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config PARISC 
	select GENERIC_ATOMIC64 if !64BIT

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select GENERIC_PCI_IOMAP

	select IRQ_PER_CPU

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

arch/parisc/lib/iomap.c

+0 −23
Original line number Diff line number Diff line
@@ -436,28 +436,6 @@ void ioport_unmap(void __iomem *addr) 
	}

}



/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */

void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)

{

	resource_size_t start = pci_resource_start(dev, bar);

	resource_size_t len = pci_resource_len(dev, bar);

	unsigned long flags = pci_resource_flags(dev, bar);



	if (!len || !start)

		return NULL;

	if (maxlen && len > maxlen)

		len = maxlen;

	if (flags & IORESOURCE_IO)

		return ioport_map(start, len);

	if (flags & IORESOURCE_MEM) {

		if (flags & IORESOURCE_CACHEABLE)

			return ioremap(start, len);

		return ioremap_nocache(start, len);

	}

	/* What? */

	return NULL;

}



void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

{

	if (!INDIRECT_ADDR(addr)) {
@@ -483,5 +461,4 @@ EXPORT_SYMBOL(iowrite16_rep); 
EXPORT_SYMBOL(iowrite32_rep);

EXPORT_SYMBOL(ioport_map);

EXPORT_SYMBOL(ioport_unmap);

EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);