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

Commit 43db595e authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

sh: switch to GENERIC_PCI_IOMAP 



sh 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 335b8cf7

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ config PCI 
	bool "PCI support"

	depends on SYS_SUPPORTS_PCI

	select PCI_DOMAINS

	select GENERIC_PCI_IOMAP

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/sh/drivers/pci/pci.c

+0 −23
Original line number Diff line number Diff line
@@ -393,29 +393,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev, 
	return (void __iomem *)(chan->io_map_base + port);

}



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 (unlikely(!len || !start))

		return NULL;

	if (maxlen && len > maxlen)

		len = maxlen;



	if (flags & IORESOURCE_IO)

		return ioport_map_pci(dev, start, len);

	if (flags & IORESOURCE_MEM) {

		if (flags & IORESOURCE_CACHEABLE)

			return ioremap(start, len);

		return ioremap_nocache(start, len);

	}



	return NULL;

}

EXPORT_SYMBOL(pci_iomap);



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

{

	iounmap(addr);