From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364Ab3BFRFX (ORCPT ); Wed, 6 Feb 2013 12:05:23 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50987 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803Ab3BFRFU (ORCPT ); Wed, 6 Feb 2013 12:05:20 -0500 Date: Wed, 06 Feb 2013 18:05:14 +0100 Message-ID: From: Takashi Iwai To: Heiko Carstens Cc: arnd@arndb.de, axboe@kernel.dk, cbou@mail.ru, davem@davemloft.net, dtor@mail.ru, dwmw2@infradead.org, grant.likely@secretlab.ca, gregkh@linuxfoundation.org, jkosina@suse.cz, jslaby@suse.cz, khali@linux-fr.org, mchehab@redhat.com, perex@perex.cz, sameo@linux.intel.com, w.sang@pengutronix.de, linux-kernel@vger.kernel.org, sebott@linux.vnet.ibm.com, gerald.schaefer@de.ibm.com, schwidefsky@de.ibm.com Subject: Re: [PATCH 12/15] sound: add missing HAS_IOPORT and GENERIC_HARDIRQS dependencies In-Reply-To: <1360167843-3587-13-git-send-email-heiko.carstens@de.ibm.com> References: <1360167843-3587-1-git-send-email-heiko.carstens@de.ibm.com> <1360167843-3587-13-git-send-email-heiko.carstens@de.ibm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 6 Feb 2013 17:24:00 +0100, Heiko Carstens wrote: > > Fix these two compile errors on s390 which does not have HAS_IOPORT > nor GENERIC_HARDIRQS: > > sound/pci/lx6464es/lx6464es.c: In function ‘snd_lx6464es_free’: > sound/pci/lx6464es/lx6464es.c:565:2: error: implicit declaration of function ‘ioport_unmap’ Shouldn't this be fixed rather in asm-generic/io.h? Something like, #if defined(CONFIG_HAS_IOPORT) && defined(CONFIG_GENERIC_IOMAP) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p); #else static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { return (void __iomem *) port; } static inline void ioport_unmap(void __iomem *p) { } #endif /* CONFIG_HAS_IOPORT */ > sound/soc/codecs/wm8903.c: In function ‘wm8903_set_pdata_irq_trigger’: > sound/soc/codecs/wm8903.c:1954:9: error: implicit declaration of function ‘irq_get_irq_data’ Ditto, how about defining #ifndef CONFIG_GENERIC_HARDIRQS #define irq_get_irq_data(x) NULL #endif somewhere appropriately? Takashi > > Cc: Jaroslav Kysela > Cc: Takashi Iwai > Signed-off-by: Heiko Carstens > --- > sound/pci/Kconfig | 1 + > sound/soc/codecs/Kconfig | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig > index 947cfb4..fe6fa93 100644 > --- a/sound/pci/Kconfig > +++ b/sound/pci/Kconfig > @@ -678,6 +678,7 @@ config SND_LOLA > > config SND_LX6464ES > tristate "Digigram LX6464ES" > + depends on HAS_IOPORT > select SND_PCM > help > Say Y here to include support for Digigram LX6464ES boards. > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > index 298822c..65e3c6a 100644 > --- a/sound/soc/codecs/Kconfig > +++ b/sound/soc/codecs/Kconfig > @@ -98,7 +98,7 @@ config SND_SOC_ALL_CODECS > select SND_SOC_WM8782 > select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI > select SND_SOC_WM8900 if I2C > - select SND_SOC_WM8903 if I2C > + select SND_SOC_WM8903 if I2C && GENERIC_HARDIRQS > select SND_SOC_WM8904 if I2C > select SND_SOC_WM8940 if I2C > select SND_SOC_WM8955 if I2C > -- > 1.7.10.4 >