From patchwork Wed Dec 9 13:37:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7808701 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AD1DE9F387 for ; Wed, 9 Dec 2015 13:37:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7E2320490 for ; Wed, 9 Dec 2015 13:37:27 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 7C254203C0 for ; Wed, 9 Dec 2015 13:37:26 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E5ECA260575; Wed, 9 Dec 2015 14:37:24 +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 5C9D02605B7; Wed, 9 Dec 2015 14:37:17 +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 DB9B92605C1; Wed, 9 Dec 2015 14:37:15 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by alsa0.perex.cz (Postfix) with ESMTP id DEAAC260591 for ; Wed, 9 Dec 2015 14:37:08 +0100 (CET) Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MDEgG-1a186J0BbQ-00GZPM; Wed, 09 Dec 2015 14:37:07 +0100 From: Arnd Bergmann To: Takashi Iwai Date: Wed, 09 Dec 2015 14:37:05 +0100 Message-ID: <1607667.Zg3De8gXcs@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:ESc7oWR5+QEHUnZbVt4Kpd+BRotWcfRX02YRp1M387ikQlbmWTJ SyBQSdy2Q1oARi2GF9IU+k6MUhWW8aRFyqhMs6wKNJj7/nbXzbYhTzmD83MvHNeVIkt34/e ZvBUvMIgQyaJw5eog+lVR4GEN+Br9zQlj79sak7UmrpcXz4rvRMpUn0eiSi0aqLBXlILFnJ 6+pVIJdsXDTMIih47lf3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Fq75t5sBm/c=:SXEN3ayiJO2sAmDqfEiYsD wqB6dK/YocJ++hGaODHAY2YHI/1OK2My7b9eBcfvRldZ6cffO1dnsaXRcaX2i6zN+6Mb0Ydwc zrY66/rkCjggI5Pp7GTpAhz/HkdxVEEM21nv4ZwkHzO/wxz9v/p7d5KcLja5U/F+nJ8OTIXAv sYLPg1QpUaEhYPxWCAk4mJKQW/RC8UlP+R7hHStbNdn7uveDZk+wJVMmymzFPDR1jCce6PAaa liaIXzR3dS8rHglZA1vQGNQdKpLbE7FMh73/AXWPf+QG2Tr6iosRyLGRV1kIl5KUIl1U85jx0 cOEo53mAOdtfKXHjpL3hCUGs9lX7uNl1iE4HM140TrrxLl32oKjSEm4tlmAFCT/4dLfSBHmmu J9eS2b5SFRNUN5hJr6GmX/98tE/ilhGL6GNtGDm4H/iZjZwbPhpnKYpqcW4COLnNLhbPjQWYh pyut+UMQulFULnyJ4MdMyq2blfpBfD6aIR4jEUaltFDVqLdy5+fmLUxRbErxD2OKwB9/XFp7E XJAaRKEVzYms5l2IQ48jVlvV248Gtiikdm+OL3fepMVstBOgPuJpH51O1ARctYMDVIWgUPWzT QY9srobKFcqcoFTWMlluI7vRfGsVq6IEuw1bGZFORwYqRedYkQM5I2VVoWzepiwrQzMZP8jAY bKT7tOaoekyuFk8Tvj1Et2YkfUezpMdbsu3ycIWONxLQMNkEeC0JB4hYP9ErnVYxAnYcJ+XNz 2C4xkjqnuK4hbJMC Cc: alsa-devel@alsa-project.org, Russell King - ARM Linux , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] sound/oss: remove VIRT_TO_BUS dependency 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 The OSS sound drivers used to rely on virt_to_bus(), but don't any more, so we can remove the Kconfig dependency. 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. As a follow-up, we can remove the virt_to_bus() implementation and Kconfig symbol in the ARM architecture. Signed-off-by: Arnd Bergmann 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