ALSA: firewire: Fix dependency on PCM and rawmidi
diff mbox

Message ID 1401438123-32192-1-git-send-email-tiwai@suse.de
State Accepted
Commit 112cddcada5001985516beda40da2288bd8aede7
Headers show

Commit Message

Takashi Iwai May 30, 2014, 8:22 a.m. UTC
Now snd-firewire-lib supports rawmidi in addition to PCM, thus we need
to give a proper dependency.  For fixing and simplification, move the
selections of SND_PCM and SND_RAWMIDI into SND_FIREWIRE_LIB section.
Then each driver doesn't have to select them but only
SND_FIREWIRE_LIB.

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/firewire/Kconfig | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Comments

Takashi Iwai May 30, 2014, 1:25 p.m. UTC | #1
At Fri, 30 May 2014 21:15:58 +0900,
Takashi Sakamoto wrote:
> 
> (May 30 2014 17:22), Takashi Iwai wrote:
> > Now snd-firewire-lib supports rawmidi in addition to PCM, thus we need
> > to give a proper dependency.  For fixing and simplification, move the
> > selections of SND_PCM and SND_RAWMIDI into SND_FIREWIRE_LIB section.
> > Then each driver doesn't have to select them but only
> > SND_FIREWIRE_LIB.
> > 
> > Reported-by: Jim Davis <jim.epost@gmail.com>
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> 
> Thanks for this patch. I've received this bug from kbuild test backend
> but I'm not so good at Kbuild system itself and have been investigating
> how the Kconfig should be.
> 
> If possible, the dependency of firewire-lib should be switchable because
> some of firewire devices don't  support MIDI interfaces. For example,
> iSight doesn't. So there may be needs not to build MIDI modules.
> 
> But for this idea, MIDI functionalities of each drivers also need to be
> disable. As a result, this idea makes the codes complicated a bit. So I
> agree with this patch.

In that case, we'd need either splitting to yet another helper module
only for rawmidi (e.g. snd-firewire-rawmidi), or introduce a Kconfig
and select it from the card driver, then build conditionally into
snd-firewire-libs.

OTOH, the current form has a clear merit of simplicity, indeed.  So,
I applied the patch now.


thanks,

Takashi

> 
> 
> Thanks
> 
> Takashi Sakamoto
> o-takashi@sakamocchi.jp
> 
> > ---
> >  sound/firewire/Kconfig | 12 ++----------
> >  1 file changed, 2 insertions(+), 10 deletions(-)
> > 
> > diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
> > index 9f363fac7688..775ef2efc296 100644
> > --- a/sound/firewire/Kconfig
> > +++ b/sound/firewire/Kconfig
> > @@ -9,12 +9,12 @@ if SND_FIREWIRE && FIREWIRE
> >  
> >  config SND_FIREWIRE_LIB
> >  	tristate
> > -	depends on SND_PCM
> > +	select SND_PCM
> > +	select SND_RAWMIDI
> >  
> >  config SND_DICE
> >  	tristate "DICE-based DACs (EXPERIMENTAL)"
> >  	select SND_HWDEP
> > -	select SND_PCM
> >  	select SND_FIREWIRE_LIB
> >  	help
> >  	  Say Y here to include support for many DACs based on the DICE
> > @@ -28,7 +28,6 @@ config SND_DICE
> >  
> >  config SND_FIREWIRE_SPEAKERS
> >  	tristate "FireWire speakers"
> > -	select SND_PCM
> >  	select SND_FIREWIRE_LIB
> >  	help
> >  	  Say Y here to include support for the Griffin FireWave Surround
> > @@ -39,7 +38,6 @@ config SND_FIREWIRE_SPEAKERS
> >  
> >  config SND_ISIGHT
> >  	tristate "Apple iSight microphone"
> > -	select SND_PCM
> >  	select SND_FIREWIRE_LIB
> >  	help
> >  	  Say Y here to include support for the front and rear microphones
> > @@ -50,8 +48,6 @@ config SND_ISIGHT
> >  
> >  config SND_SCS1X
> >  	tristate "Stanton Control System 1 MIDI"
> > -	select SND_PCM
> > -	select SND_RAWMIDI
> >  	select SND_FIREWIRE_LIB
> >  	help
> >  	  Say Y here to include support for the MIDI ports of the Stanton
> > @@ -64,8 +60,6 @@ config SND_SCS1X
> >  config SND_FIREWORKS
> >  	tristate "Echo Fireworks board module support"
> >  	select SND_FIREWIRE_LIB
> > -	select SND_RAWMIDI
> > -	select SND_PCM
> >  	select SND_HWDEP
> >  	help
> >  	  Say Y here to include support for FireWire devices based
> > @@ -82,8 +76,6 @@ config SND_FIREWORKS
> >  config SND_BEBOB
> >  	tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"
> >  	select SND_FIREWIRE_LIB
> > -	select SND_RAWMIDI
> > -	select SND_PCM
> >  	select SND_HWDEP
> >          help
> >  	 Say Y here to include support for FireWire devices based
>

Patch
diff mbox

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index 9f363fac7688..775ef2efc296 100644
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -9,12 +9,12 @@  if SND_FIREWIRE && FIREWIRE
 
 config SND_FIREWIRE_LIB
 	tristate
-	depends on SND_PCM
+	select SND_PCM
+	select SND_RAWMIDI
 
 config SND_DICE
 	tristate "DICE-based DACs (EXPERIMENTAL)"
 	select SND_HWDEP
-	select SND_PCM
 	select SND_FIREWIRE_LIB
 	help
 	  Say Y here to include support for many DACs based on the DICE
@@ -28,7 +28,6 @@  config SND_DICE
 
 config SND_FIREWIRE_SPEAKERS
 	tristate "FireWire speakers"
-	select SND_PCM
 	select SND_FIREWIRE_LIB
 	help
 	  Say Y here to include support for the Griffin FireWave Surround
@@ -39,7 +38,6 @@  config SND_FIREWIRE_SPEAKERS
 
 config SND_ISIGHT
 	tristate "Apple iSight microphone"
-	select SND_PCM
 	select SND_FIREWIRE_LIB
 	help
 	  Say Y here to include support for the front and rear microphones
@@ -50,8 +48,6 @@  config SND_ISIGHT
 
 config SND_SCS1X
 	tristate "Stanton Control System 1 MIDI"
-	select SND_PCM
-	select SND_RAWMIDI
 	select SND_FIREWIRE_LIB
 	help
 	  Say Y here to include support for the MIDI ports of the Stanton
@@ -64,8 +60,6 @@  config SND_SCS1X
 config SND_FIREWORKS
 	tristate "Echo Fireworks board module support"
 	select SND_FIREWIRE_LIB
-	select SND_RAWMIDI
-	select SND_PCM
 	select SND_HWDEP
 	help
 	  Say Y here to include support for FireWire devices based
@@ -82,8 +76,6 @@  config SND_FIREWORKS
 config SND_BEBOB
 	tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"
 	select SND_FIREWIRE_LIB
-	select SND_RAWMIDI
-	select SND_PCM
 	select SND_HWDEP
         help
 	 Say Y here to include support for FireWire devices based