[PATCH] ALSA: hda/ca0132 - Fix build error without CONFIG_PCI

[PATCH] ALSA: hda/ca0132 - Fix build error without CONFIG_PCI

[Takashi Iwai]

A call of pci_iounmap() call without CONFIG_PCI leads to a build error
on some architectures.  We tried to address this and add a check of
IS_ENABLED(CONFIG_PCI), but this still doesn't seem enough for sh.
Ideally we should fix it globally, it's really a corner case, so let's
paper over it with a simpler ifdef.

Fixes: 1e73359a24fa ("ALSA: hda/ca0132 - make pci_iounmap() call conditional")
Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_ca0132.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index e5bdbc245682..29882bda7632 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -8451,8 +8451,10 @@ static void ca0132_free(struct hda_codec *codec)
 	ca0132_exit_chip(codec);
 
 	snd_hda_power_down(codec);
-	if (IS_ENABLED(CONFIG_PCI) && spec->mem_base)
+#ifdef CONFIG_PCI
+	if (spec->mem_base)
 		pci_iounmap(codec->bus->pci, spec->mem_base);
+#endif
 	kfree(spec->spec_init_verbs);
 	kfree(codec->spec);
 }
-- 
2.16.4

Re: [PATCH] ALSA: hda/ca0132 - Fix build error without CONFIG_PCI

[Kuninori Morimoto]

Hi Takashi-san

> A call of pci_iounmap() call without CONFIG_PCI leads to a build error
> on some architectures.  We tried to address this and add a check of
> IS_ENABLED(CONFIG_PCI), but this still doesn't seem enough for sh.
> Ideally we should fix it globally, it's really a corner case, so let's
> paper over it with a simpler ifdef.
> 
> Fixes: 1e73359a24fa ("ALSA: hda/ca0132 - make pci_iounmap() call conditional")
> Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---

Thanks.
It solved my SH compile issue !!

Best regards
---
Kuninori Morimoto

Re: [PATCH] ALSA: hda/ca0132 - Fix build error without CONFIG_PCI

[Takashi Iwai]

On Wed, 06 Feb 2019 01:17:09 +0100,
Kuninori Morimoto wrote:
> 
> 
> Hi Takashi-san
> 
> > A call of pci_iounmap() call without CONFIG_PCI leads to a build error
> > on some architectures.  We tried to address this and add a check of
> > IS_ENABLED(CONFIG_PCI), but this still doesn't seem enough for sh.
> > Ideally we should fix it globally, it's really a corner case, so let's
> > paper over it with a simpler ifdef.
> > 
> > Fixes: 1e73359a24fa ("ALSA: hda/ca0132 - make pci_iounmap() call conditional")
> > Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> 
> Thanks.
> It solved my SH compile issue !!

OK, queued to for-linus branch now.


thanks,

Takashi