mn10300: drop dead code (54cfe08b) · Commits · 戴 / test

pci-iomap.c was (apparently, mistakenly) reintroduced as part of commit MN10300: Handle cacheable PCI regions in pci_iomap() probably as side-effect of forward-porting the patch from an old kernel. It's not really needed: the generic pci_iomap does the right thing here. The new file isn't compiled so it's safe to drop. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: linux-pci@vger.kernel.org Cc: trivial@kernel.org Cc: David Howells <dhowells@redhat.com> Signed-off-by:

Michael S. Tsirkin <mst@redhat.com> Signed-off-by:

Rusty Russell <rusty@rustcorp.com.au>

arch/mn10300/unit-asb2305/pci-iomap.c

deleted100644 → 0

+0 −35

Original line number	Diff line number	Diff line
		/* ASB2305 PCI I/O mapping handler
		*
		* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
		* Written by David Howells (dhowells@redhat.com)
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public Licence
		* as published by the Free Software Foundation; either version
		* 2 of the Licence, or (at your option) any later version.
		*/
		#include <linux/pci.h>
		#include <linux/module.h>

		/*
		* 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 ((flags & IORESOURCE_IO) \|\| (flags & IORESOURCE_MEM)) {
		if (flags & IORESOURCE_CACHEABLE && !(flags & IORESOURCE_IO))
		return ioremap(start, len);
		else
		return ioremap_nocache(start, len);
		}

		return NULL;
		}
		EXPORT_SYMBOL(pci_iomap);

Admin message