From patchwork Tue Dec 8 21:54:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7802421 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B334BBEEE1 for ; Tue, 8 Dec 2015 21:55:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5E52203F7 for ; Tue, 8 Dec 2015 21:55:17 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 862B8203F3 for ; Tue, 8 Dec 2015 21:55:16 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6704826059E; Tue, 8 Dec 2015 22:55:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6D7A42604D1; Tue, 8 Dec 2015 22:55:02 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id AAE97260533; Tue, 8 Dec 2015 22:55:00 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by alsa0.perex.cz (Postfix) with ESMTP id 20B572604A9 for ; Tue, 8 Dec 2015 22:54:55 +0100 (CET) Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0MSJ1n-1ZhNFD0l2p-00TWeg; Tue, 08 Dec 2015 22:54:48 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Russell King - ARM Linux Date: Tue, 08 Dec 2015 22:54:45 +0100 Message-ID: <1630488.4B57tj3Z8o@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:mTDVZe2SJNBCCtMWp6mEQg3iBfUXRbQStVFzwNXOBSYhZKwbRCG QsNPLymuIRkYNuPgjZpjQjDaVlLIEXiP859luImTctBor1iCEyUgAfXPs4GQV/nkhlMVOHg TFpyLnytaDHmFnCsgToj4MEJ68NeO0rnayeuiRv2wBCEBX8HHk15YZcxZul79+GS2MpgMjp IXRtzCghimoftZcacEhEQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:YZzt2J51RwQ=:yZ7925KOykd4iPbqHX/DV3 nPZkUiGmZbYHt+b6+K3D0eiYYR798WnDiolmlODwCgSOtuxyT+xNvuytIkzZfSNUi1dfmqaC2 6o+MxTXBQXx4YWbNwBg6Ut5+QokDSrS/sLdpk/w1x68480WLkj9jmOqLquPKPLJLsLYXMRw1T bbXBycSJWqPZWJM+Rcai6A/Z9Ru+7KKtSUwoWcGAbEtzNFTaDzPbFMusfAVcR/FgDfKSoniNq 1lRxY/Uo+VzzU8edHBUhnsu2dBM1GpgRvM77VCHMa9D2PwGGSqiPLTblTg0PIWLa2hYKtLe9X oMwM/tgPfdsy5PhA/qKnQ5Lc77/JqHKzoWqsFO2a5fEP4Poz4yKKIJXMBNSKZ3ym/Bv4ouLF7 SnXJUVNkj/tNdkG1EewHnQ4k6bf9+EGcMV8H9d01C+9swO5mOrK/k8kDHvTJ2c1WRwGrfw6Z4 GqB7Uh1V49VogfVNedv9qvVbc0gpv3wnBBAfDU9O+KNExiqiUagl+nebCYTkedwuKNI5wGHIU NZQv6sFtns2q8em/0wUZ+qLFDHE20s3Xx3InWtPYARlPIR4Parksgln+zajqsO8dlXIDvxLW/ RmUKpXfOMUkwMWSuqXttOo17n1u+kDAeb2yZtqK7C6sv1ygrhbskJcateyoI5VYC0oYcojWro K2o4WbUpMf7DXa0WjSz0pPvYBvEdHlz8CDvn7rEOz7PEOks6qlH+mVRg3Zy9rd0g6z/hd7rW6 XmRgcELJcGeUPK+D Cc: alsa-devel@alsa-project.org, Takashi Iwai Subject: [alsa-devel] [RFC] ARM: remove VIRT_TO_BUS X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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. The sound drivers used to rely on virt_to_bus, but don't any more. As a lot of architectures don't provide VIRT_TO_BUS any more, removing the dependency in sounds/oss/ would make the deprecated drivers appear there, which we probably don't want. Instead I'm replacing the simple dependency with 'VIRT_TO_BUS || RPC || NETWINDER' so we can still build these sound drivers for the platforms that need them, but don't change anything on other architectures. Signed-off-by: Arnd Bergmann --- No hurry for this one. If we can agree that it's a good idea, we can probably do the sound/oss change first, and then do the rest for the following merge window. If nobody cares about picking up the sound/oss patches, we can also just do it as one patch. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a077f59350a2..b03892cecd65 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -556,7 +556,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. diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index c79b57bf71c4..8f8c3a0571a6 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -303,20 +303,6 @@ static inline phys_addr_t __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. * diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index 735909f90349..7b87bac114a2 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -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: diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 48568fdf847f..4033fe58f0cf 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -240,7 +240,7 @@ config MSND_FIFOSIZE menuconfig SOUND_OSS tristate "OSS sound modules" - depends on ISA_DMA_API && VIRT_TO_BUS + depends on ISA_DMA_API && (VIRT_TO_BUS || ARCH_RPC || ARCH_NETWINDER) depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN help OSS is the Open Sound System suite of sound card drivers. They make