Skip to contentSkip to conversation

pcspkr: fix dependancies

PATCH RESEND In review Stas Sergeev 3 participants 8 messages May 4, 2008 – May 8, 2008

Subsystems (3)
x86 Sound Input drivers
lore
Share & tools
lore

Stas Sergeev

author
#0 lore raw

PATCH RESEND 1/1 pcspkr: fix dependancies

Quoted 3 lines · Thomas Gleixner

The input changes need to go via Dimitry, the x86 part can go in the same commit.

Acked-by Thomas Gleixner <[email protected]>

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 <[email protected]>
Acked-by Thomas Gleixner <[email protected]>
CC Vojtech Pavlik <[email protected]>
CC Michael Opdenacker <[email protected]>
CC Takashi Iwai <[email protected]>
init/Kconfig +8 -0
@@ -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
arch/x86/kernel/Makefile +1 -1
@@ -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
drivers/input/misc/Kconfig +1 -1
@@ -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.
maintainer
#1 lore raw
Quoted 8 lines · Stas Sergeev
Quoted 3 lines · Thomas Gleixner

The input changes need to go via Dimitry, the x86 part can go in the same commit.

Acked-by Thomas Gleixner <[email protected]>

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?

Signature · 1 line
Dmitry
author
#2 lore raw

Hello.

Quoted 4 lines · Dmitry Torokhov
Quoted 3 lines

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. :)

maintainer Acked-by
#3 lore raw
Quoted 6 lines · Stas Sergeev

Hello.

Quoted 3 lines · Dmitry Torokhov
Quoted 3 lines

Dmitry, would you mind applying this one?
If not, then I see no way to get either
fix applied...

Quoted 8 lines
Quoted 1 line

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 <[email protected]>
Signature · 1 line
Dmitry
author
#4 lore raw

PATCH 1/1 pcspkr: fix dependancies

Hello.

Quoted 2 lines · Dmitry Torokhov

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

Acked-by Dmitry Torokhov <[email protected]>

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 <[email protected]>
Acked-by Thomas Gleixner <[email protected]>
Acked-by Dmitry Torokhov <[email protected]>
CC Vojtech Pavlik <[email protected]>
CC Michael Opdenacker <[email protected]>
init/Kconfig +8 -0
@@ -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
arch/x86/kernel/Makefile +1 -1
@@ -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
sound/drivers/Kconfig +2 -2
@@ -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
drivers/input/misc/Kconfig +1 -1
@@ -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.
#5 lore raw

At Mon, 05 May 2008 09:02:38 +0400,

arch/x86/kernel/Makefile line 88

Quoted 11 lines · Stas Sergeev
arch/x86/kernel/Makefile +1 -1
@@ -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.

Quoted 16 lines
sound/drivers/Kconfig +2 -2
@@ -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

drivers/input/misc/Kconfig line 20

Quoted 8 lines
drivers/input/misc/Kconfig +1 -1
@@ -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

#7 lore raw
In reply to Stas Sergeev

At Thu, 08 May 2008 21:50:03 +0400,

Quoted 10 lines · Stas Sergeev

Hello.

Quoted 4 lines · Takashi Iwai

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

Quoted 65 lines

---
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 <[email protected]>
Acked-by Thomas Gleixner <[email protected]>
Acked-by Dmitry Torokhov <[email protected]>
CC Vojtech Pavlik <[email protected]>
CC Michael Opdenacker <[email protected]>
[2 pcsp_dep3.diff <text/x-patch (7bit)>]
init/Kconfig +8 -0
@@ -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
arch/x86/kernel/Makefile +1 -3
@@ -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
sound/drivers/Kconfig +2 -1
@@ -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
drivers/input/misc/Kconfig +1 -1
@@ -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
author
#6 lore raw

PATCH 1/1 pcspkr: fix dependancies

In reply to Takashi Iwai

Hello.

Quoted 4 lines · Takashi Iwai

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 <[email protected]>
Acked-by Thomas Gleixner <[email protected]>
Acked-by Dmitry Torokhov <[email protected]>
CC Vojtech Pavlik <[email protected]>
CC Michael Opdenacker <[email protected]>
init/Kconfig +8 -0
@@ -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
arch/x86/kernel/Makefile +1 -3
@@ -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
sound/drivers/Kconfig +2 -1
@@ -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
drivers/input/misc/Kconfig +1 -1
@@ -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