ALSA: hda/ca0132: need CONFIG_PCI for compile
diff mbox series

Message ID 877eeeka1n.wl-kuninori.morimoto.gx@renesas.com
State New
Headers show
Series
  • ALSA: hda/ca0132: need CONFIG_PCI for compile
Related show

Commit Message

Kuninori Morimoto Feb. 5, 2019, 6:57 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

commit d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of
iounmap()") started to use pci_iounmap() on ca0132, but then, it should
be depends on CONFIG_PCI.
Otherwise, non CONFIG_PCI compile will be failed, like below

	linux/sound/pci/hda/patch_ca0132.c: In function 'ca0132_free':
	linux/sound/pci/hda/patch_ca0132.c:8455:3: error: implicit\
		declaration of function 'pci_iounmap'; did you mean\
		'pcim_iounmap'? [-Werror=implicit-function-declaration]
	pci_iounmap(codec->bus->pci, spec->mem_base);
	^~~~~~~~~~~

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/pci/hda/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Takashi Iwai Feb. 5, 2019, 7:52 a.m. UTC | #1
On Tue, 05 Feb 2019 07:57:22 +0100,
Kuninori Morimoto wrote:
> 
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> commit d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of
> iounmap()") started to use pci_iounmap() on ca0132, but then, it should
> be depends on CONFIG_PCI.
> Otherwise, non CONFIG_PCI compile will be failed, like below
> 
> 	linux/sound/pci/hda/patch_ca0132.c: In function 'ca0132_free':
> 	linux/sound/pci/hda/patch_ca0132.c:8455:3: error: implicit\
> 		declaration of function 'pci_iounmap'; did you mean\
> 		'pcim_iounmap'? [-Werror=implicit-function-declaration]
> 	pci_iounmap(codec->bus->pci, spec->mem_base);
> 	^~~~~~~~~~~

No, the driver doesn't depend on PCI, it can be built and work fine
without it, too.  The only problem is the broken pci_iounmap()
implementation in sh.

We have added CONFIG_PCI check but obviously this isn't effective.
It needs to be an explicit #ifdef, instead.  Will fix it.

Ideally it should be fixed in arch/sh side.  I tried to fix it, but it
turned out to be much deeper than I thought, so I gave up scratching
it for now.


thanks,

Takashi

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  sound/pci/hda/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> index 4235907..03af159 100644
> --- a/sound/pci/hda/Kconfig
> +++ b/sound/pci/hda/Kconfig
> @@ -171,6 +171,7 @@ comment "Set to Y if you want auto-loading the codec driver"
>  
>  config SND_HDA_CODEC_CA0132
>  	tristate "Build Creative CA0132 codec support"
> +	depends on CONFIG_PCI
>  	help
>  	  Say Y or M here to include Creative CA0132 codec support in
>  	  snd-hda-intel driver.
> -- 
> 2.7.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
Kuninori Morimoto Feb. 5, 2019, 8:06 a.m. UTC | #2
Forward to Renesas / SH ML

arch/sh need to be fixed pci_iounmap()

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > commit d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of
> > iounmap()") started to use pci_iounmap() on ca0132, but then, it should
> > be depends on CONFIG_PCI.
> > Otherwise, non CONFIG_PCI compile will be failed, like below
> > 
> > 	linux/sound/pci/hda/patch_ca0132.c: In function 'ca0132_free':
> > 	linux/sound/pci/hda/patch_ca0132.c:8455:3: error: implicit\
> > 		declaration of function 'pci_iounmap'; did you mean\
> > 		'pcim_iounmap'? [-Werror=implicit-function-declaration]
> > 	pci_iounmap(codec->bus->pci, spec->mem_base);
> > 	^~~~~~~~~~~
> 
> No, the driver doesn't depend on PCI, it can be built and work fine
> without it, too.  The only problem is the broken pci_iounmap()
> implementation in sh.
> 
> We have added CONFIG_PCI check but obviously this isn't effective.
> It needs to be an explicit #ifdef, instead.  Will fix it.
> 
> Ideally it should be fixed in arch/sh side.  I tried to fix it, but it
> turned out to be much deeper than I thought, so I gave up scratching
> it for now.
> 
> 
> thanks,
> 
> Takashi
> 
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> >  sound/pci/hda/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> > index 4235907..03af159 100644
> > --- a/sound/pci/hda/Kconfig
> > +++ b/sound/pci/hda/Kconfig
> > @@ -171,6 +171,7 @@ comment "Set to Y if you want auto-loading the codec driver"
> >  
> >  config SND_HDA_CODEC_CA0132
> >  	tristate "Build Creative CA0132 codec support"
> > +	depends on CONFIG_PCI
> >  	help
> >  	  Say Y or M here to include Creative CA0132 codec support in
> >  	  snd-hda-intel driver.
> > -- 
> > 2.7.4
> > 
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> >

Patch
diff mbox series

diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 4235907..03af159 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -171,6 +171,7 @@  comment "Set to Y if you want auto-loading the codec driver"
 
 config SND_HDA_CODEC_CA0132
 	tristate "Build Creative CA0132 codec support"
+	depends on CONFIG_PCI
 	help
 	  Say Y or M here to include Creative CA0132 codec support in
 	  snd-hda-intel driver.