[alsa-devel] [PATCH 1/3] ALSA: hda - Remove dependency on bus->pci in hda_beep.c

[Takashi Iwai]

At Thu, 27 Feb 2014 08:44:48 -0800,
Dylan Reid wrote:
> 
> On Thu, Feb 27, 2014 at 4:03 AM, Takashi Iwai <tiwai at suse.de> wrote:
> > At Wed, 19 Feb 2014 07:16:38 -0800,
> > Dylan Reid wrote:
> >>
> >> On Wed, Feb 19, 2014 at 12:33 AM, Takashi Iwai <tiwai at suse.de> wrote:
> >> > At Tue, 18 Feb 2014 11:04:19 -0700,
> >> > Stephen Warren wrote:
> >> >>
> >> >> On 02/15/2014 02:22 AM, Takashi Iwai wrote:
> >> >> > At Sat, 15 Feb 2014 10:17:33 +0100,
> >> >> > Takashi Iwai wrote:
> >> >> >>
> >> >> >> The default parent device can be obtained directly via card object, so
> >> >> >> we don't need to rely on pci->dev.parent.  Since there is no access to
> >> >> >> pci_dev, we can reduce the inclusion of linux/pci.h, too.
> >> >> >>
> >> >> >> Signed-off-by: Takashi Iwai <tiwai at suse.de>
> >> >> >
> >> >> > I forgot the cover page: these tree patches are trivial cleanups of
> >> >> > hda-codec drivers (not the controller) to work without PCI device
> >> >> > assignment. The idea was triggered by Dylan's question.
> >> >>
> >> >> The series seems fine to me, so briefly,
> >> >> Reviewed-by: Stephen Warren <swarren at nvidia.com>
> >> >
> >> > Thanks.  Any chance to work on / submit other changes for Tegra
> >> > HD-audio support?
> >>
> >> That's the plan, hopefully I'll be able to find time to throw together
> >> an RFC by the end of the week.
> >
> > Since there was no patch appearing yet, I merged my latest development
> > branch to for-next branch, which includes lots of changes in
> > hda_intel.c and hda_codec.c.  If any, please rebase your patches to
> > it.
> 
> Thanks for the heads up.  I've got a series that is almost ready, I'm
> still trying to tease part of the build out from under CONFIG_PCI in
> the hda makefile.

I don't think we have a dependency on CONFIG_PCI in Makefile.  Kconfig
has a dependency, but it can be easily reduced by a patch like below.

Of course, it'd be better to move the whole hda directory out of pci,
but we can do it later at any time once via git.

>  I'll try to button that up and get a the whole lot
> rebased on top of the for-next branch.

Thanks!


Takashi

---
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 8756c8e32922..56d93bf45025 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -578,8 +578,6 @@ config SND_FM801_TEA575X_BOOL
 	  FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
 	  SF64-PCR) into the snd-fm801 driver.
 
-source "sound/pci/hda/Kconfig"
-
 config SND_HDSP
 	tristate "RME Hammerfall DSP Audio"
 	select FW_LOADER
@@ -889,3 +887,5 @@ config SND_YMFPCI
 	  will be called snd-ymfpci.
 
 endif	# SND_PCI
+
+source "sound/pci/hda/Kconfig"
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index f2032dd7e35e..6fc769da6949 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -1,5 +1,6 @@
 menuconfig SND_HDA_INTEL
 	tristate "Intel HD Audio"
+	depends on (PCI || SOMETHING_YOU_WANT)
 	select SND_PCM
 	select SND_VMASTER
 	select SND_KCTL_JACK