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

Commit 9e0087e6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Russell King
Browse files

ARM: 8530/1: remove VIRT_TO_BUS 



All drivers that are relevant for rpc or footbridge have stopped
using virt_to_bus a while ago, so we can remove it and avoid some
harmless randconfig warnings for drivers that we do not care about:

drivers/atm/zatm.c: In function 'poll_rx':
drivers/atm/zatm.c:401:18: warning: 'bus_to_virt' is deprecated [-Wdeprecated-declarations]
   skb = ((struct rx_buffer_head *) bus_to_virt(here[2]))->skb;

FWIW, the remaining drivers using this are:

ATM:  firestream, zatm, ambassador, horizon
ISDN: hisax/netjet
V4L:  STA2X11, zoran
Net:  Appletalk LTPC, Tulip DE4x5, Toshiba IrDA
WAN:  comtrol sv11, cosa, lanmedia, sealevel
SCSI: DPT_I2O, buslogic
VME:  CA91C142

My best guess is that all of the above are so hopelessly obsolete that
we are best off removing all of them form the kernel, but that can be
done another time.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 14753992

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ config ARCH_RPC 
	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select NO_IOPORT_MAP

	select VIRT_TO_BUS

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.

arch/arm/include/asm/memory.h

+0 −14
Original line number Diff line number Diff line
@@ -318,20 +318,6 @@ static inline unsigned long __virt_to_idmap(unsigned long x) 
#define __bus_to_pfn(x)	__phys_to_pfn(x)

#endif



#ifdef CONFIG_VIRT_TO_BUS

#define virt_to_bus virt_to_bus

static inline __deprecated unsigned long virt_to_bus(void *x)

{

	return __virt_to_bus((unsigned long)x);

}



#define bus_to_virt bus_to_virt

static inline __deprecated void *bus_to_virt(unsigned long x)

{

	return (void *)__bus_to_virt(x);

}

#endif



/*

 * Conversion between a struct page and a physical address.

 *

arch/arm/mach-footbridge/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ config ARCH_NETWINDER 
	select ISA

	select ISA_DMA

	select PCI

	select VIRT_TO_BUS

	help

	  Say Y here if you intend to run this kernel on the Rebel.COM

	  NetWinder.  Information about this machine can be found at: