[patch] pcspkr: fix dependancies

[patch] pcspkr: fix dependancies

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

Hello.

linux-2.6.25 has the strange dependancies
for pc-speaker, which prevents snd-pcsp
from working.
Namely, the platform device (created in
arch/x86/kernel/pcspeaker.c) depends on
the platform driver (CONFIG_INPUT_PCSPKR).
I wonder if it is a good practice to make
the platform device to depend on the driver,
I guess it is not.

The attached patch reverses that.
It adds the config option for the pcspkr
platform device and makes the platform
drivers to depend on that.
This allows snd-pcsp to work at least in
some configurations.

Does that patch look reasonable?

---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
CC: Takashi Iwai <tiwai@suse.de>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: Vojtech Pavlik <vojtech@suse.cz>

[-- Attachment #2: pcsp_dep.diff --]
[-- Type: text/x-patch, Size: 1797 bytes --]

--- a/init/Kconfig	2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig	2008-04-26 18:20:40.000000000 +0400
@@ -624,6 +624,14 @@
 	help
 	  Enable support for generating core dumps. Disabling saves about 4k.
 
+config PCSPKR_PLATFORM
+	bool "Enable PC-Speaker support" if EMBEDDED
+	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	default y
+	help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+
 config COMPAT_BRK
 	bool "Disable heap randomization"
 	default y
--- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
@@ -83,7 +83,7 @@
 obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
 
-ifdef CONFIG_INPUT_PCSPKR
+ifdef CONFIG_PCSPKR_PLATFORM
 obj-y				+= pcspeaker.o
 endif
 
--- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
+++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
@@ -5,8 +5,8 @@
 
 
 config SND_PCSP
-	tristate "Internal PC speaker support"
-	depends on X86_PC && HIGH_RES_TIMERS
+	tristate "PC-Speaker support"
+	depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
 	help
 	  If you don't have a sound card in your computer, you can include a
 	  driver for the PC speaker which allows it to act like a primitive
--- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
 
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
-	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	depends on PCSPKR_PLATFORM
 	help
 	  Say Y here if you want the standard PC Speaker to be used for
 	  bells and whistles.

Re: [patch] pcspkr: fix dependancies

[Dmitry Torokhov]

Hi Stas,

On Saturday 26 April 2008, Stas Sergeev wrote:
> Hello.
> 
> linux-2.6.25 has the strange dependancies
> for pc-speaker, which prevents snd-pcsp
> from working.
> Namely, the platform device (created in
> arch/x86/kernel/pcspeaker.c) depends on
> the platform driver (CONFIG_INPUT_PCSPKR).
> I wonder if it is a good practice to make
> the platform device to depend on the driver,
> I guess it is not.
> 
> The attached patch reverses that.
> It adds the config option for the pcspkr
> platform device and makes the platform
> drivers to depend on that.
> This allows snd-pcsp to work at least in
> some configurations.
> 

No, not another config option please. Either make pcspkr platform
device be created unconditionally or if either pcspkr or snd-pcsp
is selected. 

-- 
Dmitry

Re: [patch] pcspkr: fix dependancies

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

Hello.

Dmitry Torokhov wrote:
> No, not another config option please. Either make pcspkr platform
> device be created unconditionally
I also think this would be the best
fix. But this will return us to the
state of 2.6.24. Presumably the dependancy
was added for the reason, even if I
fail to see one.
But in any case, the patch is attached.

> or if either pcspkr or snd-pcsp
> is selected.
I don't think it is correct, but if
people think it is, then this can be
done.


---
Compile pcspkr platform device unconditionally.
That allows snd-pcsp to work.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>

[-- Attachment #2: pcsp_dep1.diff --]
[-- Type: text/x-patch, Size: 387 bytes --]

--- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
@@ -83,9 +83,7 @@
 obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
 
-ifdef CONFIG_INPUT_PCSPKR
 obj-y				+= pcspeaker.o
-endif
 
 obj-$(CONFIG_SCx200)		+= scx200.o
 scx200-y			+= scx200_32.o

Re: [patch] pcspkr: fix dependancies

[Dmitry Torokhov]

On Sun, Apr 27, 2008 at 03:39:37AM +0400, Stas Sergeev wrote:
> Hello.
> 
> Dmitry Torokhov wrote:
> > No, not another config option please. Either make pcspkr platform
> > device be created unconditionally
> I also think this would be the best
> fix. But this will return us to the
> state of 2.6.24. Presumably the dependancy
> was added for the reason, even if I
> fail to see one.
> But in any case, the patch is attached.
> 
> > or if either pcspkr or snd-pcsp
> > is selected.
> I don't think it is correct, but if
> people think it is, then this can be
> done.
> 

It looks like the change was introduced by commit

67926892ef7a7fbc76de607120d44416019fdf07

I think that we should register devices even if there is no driver in
the kernel for it because driver may be compiled at later time or be out
of tree. Adding patch author and other people that signed off the patch
to CC...

> 
> ---
> Compile pcspkr platform device unconditionally.
> That allows snd-pcsp to work.
> 
> Signed-off-by: Stas Sergeev <stsp@aknet.ru>

> --- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
> @@ -83,9 +83,7 @@
>  obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
>  obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
>  
> -ifdef CONFIG_INPUT_PCSPKR
>  obj-y				+= pcspeaker.o
> -endif
>  
>  obj-$(CONFIG_SCx200)		+= scx200.o
>  scx200-y			+= scx200_32.o


-- 
Dmitry

Re: [patch] pcspkr: fix dependancies

[Stas Sergeev]

Hello.

Dmitry Torokhov wrote:
> It looks like the change was introduced by commit
> 67926892ef7a7fbc76de607120d44416019fdf07
Indeed. But the log message
http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg36026.html
doesn't seem to specify the reason
for the change, so this doesn't
clarify a thing, unfortunately.

> I think that we should register devices even if there is no driver in
> the kernel for it because driver may be compiled at later time or be out
> of tree. Adding patch author and other people that signed off the patch
> to CC...
Since there seem to be no objections,
would you mind adding the patch to your
git tree? Or who should that be?

Re: [patch] pcspkr: fix dependancies

[Dmitry Torokhov]

On Mon, Apr 28, 2008 at 11:34:14PM +0400, Stas Sergeev wrote:
> Hello.
> 
> Dmitry Torokhov wrote:
> > It looks like the change was introduced by commit
> > 67926892ef7a7fbc76de607120d44416019fdf07
> Indeed. But the log message
> http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg36026.html
> doesn't seem to specify the reason
> for the change, so this doesn't
> clarify a thing, unfortunately.
> 
> > I think that we should register devices even if there is no driver in
> > the kernel for it because driver may be compiled at later time or be out
> > of tree. Adding patch author and other people that signed off the patch
> > to CC...
> Since there seem to be no objections,
> would you mind adding the patch to your
> git tree? Or who should that be?

I try to stay within drivers/input boundaries ;) Ingo I think is the
person you need.

-- 
Dmitry

Re: [patch] pcspkr: fix dependancies

[Sam Ravnborg]

On Mon, Apr 28, 2008 at 03:58:56PM -0400, Dmitry Torokhov wrote:
> On Mon, Apr 28, 2008 at 11:34:14PM +0400, Stas Sergeev wrote:
> > Hello.
> > 
> > Dmitry Torokhov wrote:
> > > It looks like the change was introduced by commit
> > > 67926892ef7a7fbc76de607120d44416019fdf07
> > Indeed. But the log message
> > http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg36026.html
> > doesn't seem to specify the reason
> > for the change, so this doesn't
> > clarify a thing, unfortunately.
> > 
> > > I think that we should register devices even if there is no driver in
> > > the kernel for it because driver may be compiled at later time or be out
> > > of tree. Adding patch author and other people that signed off the patch
> > > to CC...
> > Since there seem to be no objections,
> > would you mind adding the patch to your
> > git tree? Or who should that be?
> 
> I try to stay within drivers/input boundaries ;) Ingo I think is the
> person you need.
If you google you will find a long thread about this patch.
It is all about saving memory for embedded platforms.
No need to have the driver if there is no speaker on the board.

Ask Michael (author) if you need more info.

	Sam

Re: [patch] pcspkr: fix dependancies

[Dmitry Torokhov]

On Mon, Apr 28, 2008 at 10:12:25PM +0200, Sam Ravnborg wrote:
> On Mon, Apr 28, 2008 at 03:58:56PM -0400, Dmitry Torokhov wrote:
> > On Mon, Apr 28, 2008 at 11:34:14PM +0400, Stas Sergeev wrote:
> > > Hello.
> > > 
> > > Dmitry Torokhov wrote:
> > > > It looks like the change was introduced by commit
> > > > 67926892ef7a7fbc76de607120d44416019fdf07
> > > Indeed. But the log message
> > > http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg36026.html
> > > doesn't seem to specify the reason
> > > for the change, so this doesn't
> > > clarify a thing, unfortunately.
> > > 
> > > > I think that we should register devices even if there is no driver in
> > > > the kernel for it because driver may be compiled at later time or be out
> > > > of tree. Adding patch author and other people that signed off the patch
> > > > to CC...
> > > Since there seem to be no objections,
> > > would you mind adding the patch to your
> > > git tree? Or who should that be?
> > 
> > I try to stay within drivers/input boundaries ;) Ingo I think is the
> > person you need.
> If you google you will find a long thread about this patch.
> It is all about saving memory for embedded platforms.
> No need to have the driver if there is no speaker on the board.
> 

The patch does it backwards though - it disables platform device if
there is no driver. We don't stop enumerating PCI devices if some of
them don't have a driver for them, do we? The arch code should not
create the device if it knows that the boards does not have it.

-- 
Dmitry

Re: [patch] pcspkr: fix dependancies

[Stas Sergeev]

Hello.

Sam Ravnborg wrote:
> If you google you will find a long thread about this patch.
Yes, indeed, thankyou.
http://kerneltrap.org/mailarchive/linux-kernel/2008/1/17/577151

> It is all about saving memory for embedded platforms.
OK. This wasn't clear from the log
message for some reason, but it is
said in the above thread.

> No need to have the driver if there is no speaker on the board.
Very probably, and for that case I
made the patch like this:
http://uwsg.ucs.indiana.edu/hypermail/linux/kernel/0804.3/1189.html

> Ask Michael (author) if you need more info.
Reading the thread, it actually seems
like Michael wanted to submit the patch
much like the aforementioned one of
mine:
http://kerneltrap.org/mailarchive/linux-kernel/2008/1/18/580583
but haven't done so in time, and as the
result, the wrong one stuck in.
But this is never too late to correct, I
hope.

So I see 2 options: either revert the
patch completely, or revert the dependancies
like Michael suggested initially (if I
understand his suggestion right).
Both patches are here, in this thread.
Thoughts?

Re: [patch] pcspkr: fix dependancies

[Michael Opdenacker]

On 04/29/2008 09:56 PM, Stas Sergeev wrote:
> Reading the thread, it actually seems
> like Michael wanted to submit the patch
> much like the aforementioned one of
> mine:
> http://kerneltrap.org/mailarchive/linux-kernel/2008/1/18/580583
> but haven't done so in time, and as the
> result, the wrong one stuck in.
> But this is never too late to correct, I
> hope.
>
> So I see 2 options: either revert the
> patch completely, or revert the dependancies
> like Michael suggested initially (if I
> understand his suggestion right).
> Both patches are here, in this thread.
> Thoughts?
>
>   
Stas, Dmitry,

I agree with you... on a regular system, all the platform devices should
be enumerated, even if we don't use their drivers. It's only for use in
embedded devices (CONFIG_EMBEDDED) that we could omit this enumeration
to reduce kernel size.

Would you post a patch doing this?

Thank you,

:-)

Michael.

-- 
Michael Opdenacker, Free Electrons
Free Embedded Linux Training Materials
on http://free-electrons.com/training
(More than 1500 pages!)

Re: [patch] pcspkr: fix dependancies

[Stas Sergeev]

Hello.

Michael Opdenacker wrote:
> I agree with you... on a regular system, all the platform devices should
> be enumerated, even if we don't use their drivers. It's only for use in
> embedded devices (CONFIG_EMBEDDED) that we could omit this enumeration
> to reduce kernel size.
> Would you post a patch doing this?
Certainly, this was done.
http://uwsg.ucs.indiana.edu/hypermail/linux/kernel/0804.3/1189.html
Does this help?

Re: [patch] pcspkr: fix dependancies

[Stas Sergeev]

Guys, there really needs to be a
few more replies to make a decision.

So far only Dmitry have clearly stated
his opinion regarding both patches.
And that opinion was: no need for the
new config option, just get the 2.6.25
patch reverted.
Dmitry, after reading the older Michael's
thread, would you perhaps reconsider?

Sam and Michael said that just revering
may not be a good idea, but have not
commented on the patch that adds a new
option under "if EMBEDDED".

That puts me in a position where both
patches are effectively blocked, and
in a mean time snd-pcsp remains broken.

Guys, please, give your ACK or NACK on
the two posted patches! :)
Namely:
http://lkml.org/lkml/2008/4/26/105
http://lkml.org/lkml/2008/4/26/283

[patch][resend] pcspkr: fix dependancies

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

Thomas Gleixner wrote:
> The input changes need to go via Dimitry, the x86 part can go in the
> same commit.
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Dmitry, would you mind applying this one?
If not, then I see no way to get either
fix applied...

---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>
CC: Takashi Iwai <tiwai@suse.de>


[-- Attachment #2: pcsp_dep2.diff --]
[-- Type: text/x-patch, Size: 1315 bytes --]

--- a/init/Kconfig	2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig	2008-04-26 18:20:40.000000000 +0400
@@ -624,6 +624,14 @@
 	help
 	  Enable support for generating core dumps. Disabling saves about 4k.
 
+config PCSPKR_PLATFORM
+	bool "Enable PC-Speaker support" if EMBEDDED
+	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	default y
+	help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+
 config COMPAT_BRK
 	bool "Disable heap randomization"
 	default y
--- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
@@ -83,7 +83,7 @@
 obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
 
-ifdef CONFIG_INPUT_PCSPKR
+ifdef CONFIG_PCSPKR_PLATFORM
 obj-y				+= pcspeaker.o
 endif
 
--- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
 
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
-	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	depends on PCSPKR_PLATFORM
 	help
 	  Say Y here if you want the standard PC Speaker to be used for
 	  bells and whistles.

Re: [patch][resend] pcspkr: fix dependancies

[Dmitry Torokhov]

On Sun, May 04, 2008 at 08:22:32AM +0400, Stas Sergeev wrote:
> Thomas Gleixner wrote:
> > The input changes need to go via Dimitry, the x86 part can go in the
> > same commit.
> > Acked-by: Thomas Gleixner <tglx@linutronix.de>
> Dmitry, would you mind applying this one?
> If not, then I see no way to get either
> fix applied...
> 

Ok, but don't you need to also add the same dependancy for SND_PCSP?

-- 
Dmitry

Re: [patch][resend] pcspkr: fix dependancies

[Stas Sergeev]

Hello.

Dmitry Torokhov wrote:
>> Dmitry, would you mind applying this one?
>> If not, then I see no way to get either
>> fix applied...
> Ok, but don't you need to also add the same dependancy for SND_PCSP?
Thanks!
As for SND_PCSP - I decided to skip
that part and send it as a separate
patch to Takashi, when this one is
settled. Otherwise it would be even
more difficult to find the right person
to apply the whole thing. :)

Re: [patch][resend] pcspkr: fix dependancies

[Dmitry Torokhov]

On Mon, May 05, 2008 at 08:26:12AM +0400, Stas Sergeev wrote:
> Hello.
> 
> Dmitry Torokhov wrote:
> >> Dmitry, would you mind applying this one?
> >> If not, then I see no way to get either
> >> fix applied...
> > Ok, but don't you need to also add the same dependancy for SND_PCSP?
> Thanks!
> As for SND_PCSP - I decided to skip
> that part and send it as a separate
> patch to Takashi, when this one is
> settled. Otherwise it would be even
> more difficult to find the right person
> to apply the whole thing. :)

Why don't we ask Takashi to apply it in one step? You can add my

	Acked-by: Dmitry Torokhov <dtor@mail.ru>

-- 
Dmitry

[patch][resend2] pcspkr: fix dependancies

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

Hello.

Dmitry Torokhov wrote:
> Why don't we ask Takashi to apply it in one step? You can add my
> 	Acked-by: Dmitry Torokhov <dtor@mail.ru>
OK, lets do. :)
Takashi, could you please apply?

---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>

[-- Attachment #2: pcsp_dep.diff --]
[-- Type: text/x-patch, Size: 1797 bytes --]

--- a/init/Kconfig	2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig	2008-04-26 18:20:40.000000000 +0400
@@ -624,6 +624,14 @@
 	help
 	  Enable support for generating core dumps. Disabling saves about 4k.
 
+config PCSPKR_PLATFORM
+	bool "Enable PC-Speaker support" if EMBEDDED
+	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	default y
+	help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+
 config COMPAT_BRK
 	bool "Disable heap randomization"
 	default y
--- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
@@ -83,7 +83,7 @@
 obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
 
-ifdef CONFIG_INPUT_PCSPKR
+ifdef CONFIG_PCSPKR_PLATFORM
 obj-y				+= pcspeaker.o
 endif
 
--- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
+++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
@@ -5,8 +5,8 @@
 
 
 config SND_PCSP
-	tristate "Internal PC speaker support"
-	depends on X86_PC && HIGH_RES_TIMERS
+	tristate "PC-Speaker support"
+	depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
 	help
 	  If you don't have a sound card in your computer, you can include a
 	  driver for the PC speaker which allows it to act like a primitive
--- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
 
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
-	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	depends on PCSPKR_PLATFORM
 	help
 	  Say Y here if you want the standard PC Speaker to be used for
 	  bells and whistles.

Re: [patch][resend2] pcspkr: fix dependancies

[Takashi Iwai]

At Mon, 05 May 2008 09:02:38 +0400,
Stas Sergeev wrote:
> 
> --- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
> @@ -83,7 +83,7 @@
>  obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
>  obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
>  
> -ifdef CONFIG_INPUT_PCSPKR
> +ifdef CONFIG_PCSPKR_PLATFORM
>  obj-y				+= pcspeaker.o
>  endif

This could be replaced now better with

  obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o

without if-endif since CONFIG_PCSPKR_PLATFORM is a bool.

> --- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
> @@ -5,8 +5,8 @@
>  
>  
>  config SND_PCSP
> -	tristate "Internal PC speaker support"
> -	depends on X86_PC && HIGH_RES_TIMERS
> +	tristate "PC-Speaker support"
> +	depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
>  	help
>  	  If you don't have a sound card in your computer, you can include a
>  	  driver for the PC speaker which allows it to act like a primitive
> --- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>  
>  config INPUT_PCSPKR
>  	tristate "PC Speaker support"
> -	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> +	depends on PCSPKR_PLATFORM
>  	help
>  	  Say Y here if you want the standard PC Speaker to be used for
>  	  bells and whistles.

These two chunks don't apply on 2.6.26-git tree.  Please recreate the
patch.


thanks,

Takashi

[patch] pcspkr: fix dependancies

[Stas Sergeev]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hello.

Takashi Iwai wrote:
> This could be replaced now better with
>   obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
> These two chunks don't apply on 2.6.26-git tree.  Please recreate the
> patch.
Done.
Could you please apply?

---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>

[-- Attachment #2: pcsp_dep3.diff --]
[-- Type: text/x-patch, Size: 1728 bytes --]

--- a/init/Kconfig	2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig	2008-04-26 18:20:40.000000000 +0400
@@ -634,6 +634,14 @@
 	help
 	  Enable support for generating core dumps. Disabling saves about 4k.
 
+config PCSPKR_PLATFORM
+	bool "Enable PC-Speaker support" if EMBEDDED
+	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	default y
+	help
+          This option allows to disable the internal PC-Speaker
+          support, saving some memory.
+
 config COMPAT_BRK
 	bool "Disable heap randomization"
 	default y
--- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
@@ -83,9 +83,7 @@
 obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
 
-ifdef CONFIG_INPUT_PCSPKR
-obj-y				+= pcspeaker.o
-endif
+obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o
 
 obj-$(CONFIG_SCx200)		+= scx200.o
 scx200-y			+= scx200_32.o
--- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
+++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
@@ -5,7 +5,8 @@
 
 
 config SND_PCSP
-	tristate "Internal PC speaker support"
+	tristate "PC-Speaker support"
+	depends on PCSPKR_PLATFORM
 	depends on X86_PC && HIGH_RES_TIMERS
 	depends on INPUT
 	depends on SND
--- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
 
 config INPUT_PCSPKR
 	tristate "PC Speaker support"
-	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+	depends on PCSPKR_PLATFORM
 	depends on SND_PCSP=n
 	help
 	  Say Y here if you want the standard PC Speaker to be used for

Re: [patch] pcspkr: fix dependancies

[Takashi Iwai]

At Thu, 08 May 2008 21:50:03 +0400,
Stas Sergeev wrote:
> 
> Hello.
> 
> Takashi Iwai wrote:
> > This could be replaced now better with
> >   obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
> > These two chunks don't apply on 2.6.26-git tree.  Please recreate the
> > patch.
> Done.
> Could you please apply?

Ah sorry, forgot to follow up that I had already fixed and applied
your patch to my git tree.  Since it passed some build tests, I'll
submit the pull request soon later.


thanks,

Takashi

> 
> ---
> fix pcspkr dependancies: make the pcspkr platform
> drivers to depend on a platform device, and
> not the other way around.
> 
> Signed-off-by: Stas Sergeev <stsp@aknet.ru>
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
> Acked-by: Dmitry Torokhov <dtor@mail.ru>
> CC: Vojtech Pavlik <vojtech@suse.cz>
> CC: Michael Opdenacker <michael-lists@free-electrons.com>
> [2 pcsp_dep3.diff <text/x-patch (7bit)>]
> --- a/init/Kconfig	2008-04-26 13:40:20.000000000 +0400
> +++ b/init/Kconfig	2008-04-26 18:20:40.000000000 +0400
> @@ -634,6 +634,14 @@
>  	help
>  	  Enable support for generating core dumps. Disabling saves about 4k.
>  
> +config PCSPKR_PLATFORM
> +	bool "Enable PC-Speaker support" if EMBEDDED
> +	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> +	default y
> +	help
> +          This option allows to disable the internal PC-Speaker
> +          support, saving some memory.
> +
>  config COMPAT_BRK
>  	bool "Disable heap randomization"
>  	default y
> --- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
> @@ -83,9 +83,7 @@
>  obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o
>  obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
>  
> -ifdef CONFIG_INPUT_PCSPKR
> -obj-y				+= pcspeaker.o
> -endif
> +obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o
>  
>  obj-$(CONFIG_SCx200)		+= scx200.o
>  scx200-y			+= scx200_32.o
> --- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
> @@ -5,7 +5,8 @@
>  
>  
>  config SND_PCSP
> -	tristate "Internal PC speaker support"
> +	tristate "PC-Speaker support"
> +	depends on PCSPKR_PLATFORM
>  	depends on X86_PC && HIGH_RES_TIMERS
>  	depends on INPUT
>  	depends on SND
> --- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>  
>  config INPUT_PCSPKR
>  	tristate "PC Speaker support"
> -	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> +	depends on PCSPKR_PLATFORM
>  	depends on SND_PCSP=n
>  	help
>  	  Say Y here if you want the standard PC Speaker to be used for