sparc: Kill sbus_ioremap() and sbus_iounmap(). (615deeb2) · Commits · 戴 / test

arch/sparc/include/asm/io_32.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -292,14 +292,6 @@ struct pci_dev;
		extern void __iomem pci_iomap(struct pci_dev dev, int bar, unsigned long max);
		extern void pci_iounmap(struct pci_dev dev, void __iomem );

		/*
		* Bus number may be in res->flags... somewhere.
		*/
		extern void __iomem sbus_ioremap(struct resource res, unsigned long offset,
		unsigned long size, char *name);
		extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size);


		/*
		* At the moment, we do not use CMOS_READ anywhere outside of rtc.c,
		* so rtc_port is static in it. This should not change unless a new

+0 −13

Original line number	Diff line number	Diff line
		@@ -482,19 +482,6 @@ struct pci_dev;
		extern void __iomem pci_iomap(struct pci_dev dev, int bar, unsigned long max);
		extern void pci_iounmap(struct pci_dev dev, void __iomem );

		/* Similarly for SBUS. */
		#define sbus_ioremap(__res, __offset, __size, __name) \
		({ unsigned long __ret; \
		__ret = (__res)->start + (((__res)->flags & 0x1ffUL) << 32UL); \
		__ret += (unsigned long) (__offset); \
		if (! request_region((__ret), (__size), (__name))) \
		__ret = 0UL; \
		(void __iomem *) __ret; \
		})

		#define sbus_iounmap(__addr, __size) \
		release_region((unsigned long)(__addr), (__size))

		static inline int sbus_can_dma_64bit(void)
		{
		return 1;

+0 −16

Original line number	Diff line number	Diff line
		@@ -143,15 +143,6 @@ void iounmap(volatile void __iomem *virtual)
		}
		}

		/*
		*/
		void __iomem sbus_ioremap(struct resource phyres, unsigned long offset,
		unsigned long size, char *name)
		{
		return _sparc_alloc_io(phyres->flags & 0xF,
		phyres->start + offset, size, name);
		}

		void __iomem of_ioremap(struct resource res, unsigned long offset,
		unsigned long size, char *name)
		{
		@@ -167,13 +158,6 @@ void of_iounmap(struct resource res, void __iomem base, unsigned long size)
		}
		EXPORT_SYMBOL(of_iounmap);

		/*
		*/
		void sbus_iounmap(volatile void __iomem *addr, unsigned long size)
		{
		iounmap(addr);
		}

		/*
		* Meat of mapping
		*/

+0 −2

Original line number	Diff line number	Diff line
		@@ -154,8 +154,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached));

		#ifdef CONFIG_SBUS
		EXPORT_SYMBOL(sbus_set_sbus64);
		EXPORT_SYMBOL(sbus_iounmap);
		EXPORT_SYMBOL(sbus_ioremap);
		#endif
		#ifdef CONFIG_PCI
		EXPORT_SYMBOL(ebus_chain);