[2.6 patch] schedule obsolete OSS drivers for removal

3 views
Skip to first unread message

Adrian Bunk

unread,
Oct 30, 2005, 5:51:45 AM10/30/05
to Andrew Morton, linux-...@vger.kernel.org

This patch schedules obsolete OSS drivers (with ALSA drivers that support the
same hardware) for removal.

Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.


Signed-off-by: Adrian Bunk <bu...@stusta.de>
Signed-off-by: Andrew Morton <ak...@osdl.org>

---

Documentation/feature-removal-schedule.txt | 7 ++
sound/oss/Kconfig | 73 +++++++++++++++++------------
2 files changed, 51 insertions(+), 29 deletions(-)

diff -puN Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-version-2 Documentation/feature-removal-schedule.txt
--- devel/Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-version-2 2005-08-06 15:34:48.000000000 -0700
+++ devel-akpm/Documentation/feature-removal-schedule.txt 2005-08-06 15:34:48.000000000 -0700
@@ -42,6 +42,13 @@ Who: Adrian Bunk <bu...@stusta.de>

---------------------------

+What: drivers depending on OBSOLETE_OSS_DRIVER
+When: January 2006
+Why: OSS drivers with ALSA replacements
+Who: Adrian Bunk <bu...@stusta.de>
+
+---------------------------
+
What: RCU API moves to EXPORT_SYMBOL_GPL
When: April 2006
Files: include/linux/rcupdate.h, kernel/rcupdate.c
diff -puN sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-version-2 sound/oss/Kconfig
--- devel/sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-version-2 2005-08-06 15:34:48.000000000 -0700
+++ devel-akpm/sound/oss/Kconfig 2005-08-06 15:34:48.000000000 -0700
@@ -4,9 +4,24 @@
# More hacking for modularisation.
#
# Prompt user for primary drivers.
+
+config OBSOLETE_OSS_DRIVER
+ bool "Obsolete OSS drivers"
+ depends on SOUND_PRIME
+ help
+ This option enables support for obsolete OSS drivers that
+ are scheduled for removal in the near future since there
+ are ALSA drivers for the same hardware.
+
+ Please contact Adrian Bunk <bu...@stusta.de> if you had to
+ say Y here because your soundcard is not properly supported
+ by ALSA.
+
+ If unsure, say N.
+
config SOUND_BT878
tristate "BT878 audio dma"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
---help---
Audio DMA support for bt878 based grabber boards. As you might have
already noticed, bt878 is listed with two functions in /proc/pci.
@@ -22,7 +37,7 @@ config SOUND_BT878

config SOUND_CMPCI
tristate "C-Media PCI (CMI8338/8738)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card using the CMI8338
or the CMI8738 chipset. Data on these chips are available at
@@ -61,7 +76,7 @@ config SOUND_CMPCI_JOYSTICK

config SOUND_EMU10K1
tristate "Creative SBLive! (EMU10K1)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
---help---
Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -95,7 +110,7 @@ config SOUND_FUSION

config SOUND_CS4281
tristate "Crystal Sound CS4281"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Picture and feature list at
<http://www.pcbroker.com/crystal4281.html>.
@@ -112,7 +127,7 @@ config SOUND_BCM_CS4297A

config SOUND_ES1370
tristate "Ensoniq AudioPCI (ES1370)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +140,7 @@ config SOUND_ES1370

config SOUND_ES1371
tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +153,7 @@ config SOUND_ES1371

config SOUND_ESSSOLO1
tristate "ESS Technology Solo1"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the ESS Technology
Solo1 chip. To find out if your sound card uses a
@@ -149,7 +164,7 @@ config SOUND_ESSSOLO1

config SOUND_MAESTRO
tristate "ESS Maestro, Maestro2, Maestro2E driver"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a sound system driven by ESS's Maestro line
of PCI sound chips. These include the Maestro 1, Maestro 2, and
@@ -158,7 +173,7 @@ config SOUND_MAESTRO

config SOUND_MAESTRO3
tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
- depends on SOUND_PRIME && PCI && EXPERIMENTAL
+ depends on SOUND_PRIME && PCI && EXPERIMENTAL && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a sound system driven by ESS's Maestro 3
PCI sound chip.
@@ -172,14 +187,14 @@ config SOUND_ICH

config SOUND_HARMONY
tristate "PA Harmony audio driver"
- depends on GSC_LASI && SOUND_PRIME
+ depends on GSC_LASI && SOUND_PRIME && OBSOLETE_OSS_DRIVER
help
Say 'Y' or 'M' to include support for Harmony soundchip
on HP 712, 715/new and many other GSC based machines.

config SOUND_SONICVIBES
tristate "S3 SonicVibes"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the S3
SonicVibes chipset. To find out if your sound card uses a
@@ -218,7 +233,7 @@ config SOUND_VRC5477

config SOUND_AU1000
tristate "Au1000 Sound"
- depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
+ depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && OBSOLETE_OSS_DRIVER

config SOUND_AU1550_AC97
tristate "Au1550 AC97 Sound"
@@ -492,7 +507,7 @@ config MSND_FIFOSIZE

config SOUND_VIA82CXXX
tristate "VIA 82C686 Audio Codec"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y here to include support for the audio codec found on VIA
82Cxxx-based chips. Typically these are built into a motherboard.
@@ -563,7 +578,7 @@ config SOUND_AD1889

config SOUND_SGALAXY
tristate "Aztech Sound Galaxy (non-PnP) cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
This module initializes the older non Plug and Play sound galaxy
cards from Aztech. It supports the Waverider Pro 32 - 3D and the
@@ -599,7 +614,7 @@ config SOUND_ACI_MIXER

config SOUND_CS4232
tristate "Crystal CS4232 based (PnP) cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a card based on the Crystal CS4232 chip set,
which uses its own Plug and Play protocol.
@@ -613,7 +628,7 @@ config SOUND_CS4232

config SOUND_SSCAPE
tristate "Ensoniq SoundScape support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Answer Y if you have a sound card based on the Ensoniq SoundScape
chipset. Such cards are being manufactured at least by Ensoniq, Spea
@@ -625,7 +640,7 @@ config SOUND_SSCAPE

config SOUND_GUS
tristate "Gravis Ultrasound support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here for any type of Gravis Ultrasound card, including the GUS
or GUS MAX. See also <file:Documentation/sound/oss/ultrasound> for more
@@ -727,7 +742,7 @@ config SOUND_MPU401

config SOUND_NM256
tristate "NM256AV/NM256ZX audio support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say M here to include audio support for the NeoMagic 256AV/256ZX
chipsets. These are the audio chipsets found in the Sony
@@ -739,7 +754,7 @@ config SOUND_NM256

config SOUND_MAD16
tristate "OPTi MAD16 and/or Mozart based cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
---help---
Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
82C928 or 82C929 or 82C931) audio interface chip. These chips are
@@ -860,7 +875,7 @@ config SOUND_SB

config SOUND_AWE32_SYNTH
tristate "AWE32 synth"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
similar sound card. See <file:Documentation/sound/oss/README.awe>,
@@ -870,7 +885,7 @@ config SOUND_AWE32_SYNTH

config SOUND_WAVEFRONT
tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards"
- depends on SOUND_OSS && m
+ depends on SOUND_OSS && m && OBSOLETE_OSS_DRIVER
help
Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card
and read the files <file:Documentation/sound/oss/Wavefront> and
@@ -878,7 +893,7 @@ config SOUND_WAVEFRONT

config SOUND_MAUI
tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez
sound card.
@@ -904,7 +919,7 @@ config MAUI_BOOT_FILE

config SOUND_YM3812
tristate "Yamaha FM synthesizer (YM3812/OPL-3) support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
---help---
Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
Answering Y is usually a safe and recommended choice, however some
@@ -920,7 +935,7 @@ config SOUND_YM3812

config SOUND_OPL3SA1
tristate "Yamaha OPL3-SA1 audio controller"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
usually built into motherboards. Read
@@ -946,7 +961,7 @@ config SOUND_OPL3SA2

config SOUND_YMFPCI
tristate "Yamaha YMF7xx PCI audio (native mode)"
- depends on SOUND_OSS && PCI
+ depends on SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER
help
Support for Yamaha cards including the YMF711, YMF715, YMF718,
YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital.
@@ -1088,11 +1103,11 @@ config SOUND_KAHLUA

config SOUND_ALI5455
tristate "ALi5455 audio support"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER

config SOUND_FORTE
tristate "ForteMedia FM801 driver"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you want driver support for the ForteMedia FM801 PCI
audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1115,7 @@ config SOUND_FORTE

config SOUND_RME96XX
tristate "RME Hammerfall (RME96XX) support"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a Hammerfall or Hammerfall light
multichannel card from RME. If you want to access advanced
@@ -1108,7 +1123,7 @@ config SOUND_RME96XX

config SOUND_AD1980
tristate "AD1980 front/back switch plugin"
- depends on SOUND_PRIME
+ depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER

config SOUND_SH_DAC_AUDIO
tristate "SuperH DAC audio support"
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Gene Heskett

unread,
Oct 30, 2005, 8:41:48 AM10/30/05
to linux-...@vger.kernel.org, Adrian Bunk, Andrew Morton
On Sunday 30 October 2005 05:51, Adrian Bunk wrote:
>This patch schedules obsolete OSS drivers (with ALSA drivers that
> support the same hardware) for removal.
>
>Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
>
Isn't this a bit premature? There are quite a few old mobo's with this
chipset still in use, like my firewall box.

--
Cheers, Gene
"There are four boxes to be used in defense of liberty:
soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.35% setiathome rank, not too shabby for a WV hillbilly
Free OpenDocument reader/writer/converter download:
http://www.openoffice.org
Yahoo.com and AOL/TW attorneys please note, additions to the above
message by Gene Heskett are:
Copyright 2005 by Maurice Eugene Heskett, all rights reserved.

Adrian Bunk

unread,
Oct 30, 2005, 8:52:10 AM10/30/05
to Gene Heskett, linux-...@vger.kernel.org, Andrew Morton
On Sun, Oct 30, 2005 at 09:41:06AM -0400, Gene Heskett wrote:
> On Sunday 30 October 2005 05:51, Adrian Bunk wrote:
> >This patch schedules obsolete OSS drivers (with ALSA drivers that
> > support the same hardware) for removal.
> >
> >Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
> >
> Isn't this a bit premature? There are quite a few old mobo's with this
> chipset still in use, like my firewall box.
>...

Sounds like a deja vu:
http://www.ussg.iu.edu/hypermail/linux/kernel/0507.3/0527.html
http://www.ussg.iu.edu/hypermail/linux/kernel/0507.3/0555.html
http://www.ussg.iu.edu/hypermail/linux/kernel/0507.3/0717.html

;-)

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

Alistair John Strachan

unread,
Oct 30, 2005, 8:54:43 AM10/30/05
to Gene Heskett, linux-...@vger.kernel.org, Adrian Bunk, Andrew Morton
On Sunday 30 October 2005 13:41, Gene Heskett wrote:
> On Sunday 30 October 2005 05:51, Adrian Bunk wrote:
> >This patch schedules obsolete OSS drivers (with ALSA drivers that
> > support the same hardware) for removal.
> >
> >Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
>
> Isn't this a bit premature? There are quite a few old mobo's with this
> chipset still in use, like my firewall box.

Gene, if you read the discussion regarding OSS, Adrian plans simply to remove
drivers which have solid, known working replacements for all PCI ids in an
equivalent ALSA driver.

--
Cheers,
Alistair.

'No sense being pessimistic, it probably wouldn't work anyway.'
Third year Computer Science undergraduate.
1F2 55 South Clerk Street, Edinburgh, UK.

Kyle McMartin

unread,
Oct 30, 2005, 9:29:26 AM10/30/05
to Adrian Bunk, Andrew Morton, linux-...@vger.kernel.org
On Sun, Oct 30, 2005 at 11:51:18AM +0100, Adrian Bunk wrote:
>
> This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> same hardware) for removal.
>

I didn't see it here, but SOUND_AD1889 can definitely be removed
as well. The driver never worked properly to begin with. This was
ACK'd by the author last time this thread reared it's head.

Cheers,
Kyle

Adrian Bunk

unread,
Oct 30, 2005, 10:14:05 AM10/30/05
to Kyle McMartin, Andrew Morton, linux-...@vger.kernel.org
On Sun, Oct 30, 2005 at 09:27:52AM -0500, Kyle McMartin wrote:
> On Sun, Oct 30, 2005 at 11:51:18AM +0100, Adrian Bunk wrote:
> >
> > This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> > same hardware) for removal.
> >
>
> I didn't see it here, but SOUND_AD1889 can definitely be removed
> as well. The driver never worked properly to begin with. This was
> ACK'd by the author last time this thread reared it's head.

ALSA bugs [1] #1301 and #1302 are still open.

If they are resolved, SOUND_AD1889 will part of the next batch of OSS
driver removal a few months from now.

> Cheers,
> Kyle

cu
Adrian

[1] https://bugtrack.alsa-project.org/

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

Adrian Bunk

unread,
Oct 30, 2005, 10:55:08 AM10/30/05
to Kyle McMartin, Andrew Morton, linux-...@vger.kernel.org, Randolph Chung
On Sun, Oct 30, 2005 at 10:19:42AM -0500, Kyle McMartin wrote:

> On Sun, Oct 30, 2005 at 04:12:56PM +0100, Adrian Bunk wrote:
> > ALSA bugs [1] #1301 and #1302 are still open.
> >
>
> Am I doing something wrong? Those look to be AD1816 bugs, not AD1889.
> AD1816 is an ISA sound card. AD1889 is a PCI sound card only found on
> PA-RISC workstations.
>...

Sorry, my bad.

The ad1889 ALSA driver was not present before 2.6.14 and therefore not
on my original list.

Below is an updated patch that also schedules SOUND_AD1889 for removal.

cu
Adrian


<-- snip -->


This patch schedules obsolete OSS drivers (with ALSA drivers that
support the
same hardware) for removal.

Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.


Signed-off-by: Adrian Bunk <bu...@stusta.de>
Signed-off-by: Andrew Morton <ak...@osdl.org>

---

Documentation/feature-removal-schedule.txt | 7 +
sound/oss/Kconfig | 75 ++++++++++++---------
2 files changed, 52 insertions(+), 30 deletions(-)

--- linux-2.6.14-rc5-mm1-full/Documentation/feature-removal-schedule.txt.old 2005-10-30 16:32:41.000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/Documentation/feature-removal-schedule.txt 2005-10-30 16:34:51.000000000 +0100
@@ -25,6 +25,13 @@

---------------------------

+What: drivers depending on OBSOLETE_OSS_DRIVER or OBSOLETE_OSS_USB_DRIVER


+When: January 2006
+Why: OSS drivers with ALSA replacements
+Who: Adrian Bunk <bu...@stusta.de>
+
+---------------------------
+
What: RCU API moves to EXPORT_SYMBOL_GPL
When: April 2006
Files: include/linux/rcupdate.h, kernel/rcupdate.c

--- linux-2.6.14-rc5-mm1-full/sound/oss/Kconfig.old 2005-10-30 16:32:31.000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/sound/oss/Kconfig 2005-10-30 16:33:11.000000000 +0100

config SOUND_CMPCI
tristate "C-Media PCI (CMI8338/8738)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card using the CMI8338
or the CMI8738 chipset. Data on these chips are available at
@@ -61,7 +76,7 @@

config SOUND_EMU10K1
tristate "Creative SBLive! (EMU10K1)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
---help---
Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -95,7 +110,7 @@

config SOUND_CS4281
tristate "Crystal Sound CS4281"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Picture and feature list at
<http://www.pcbroker.com/crystal4281.html>.
@@ -112,7 +127,7 @@

config SOUND_ES1370
tristate "Ensoniq AudioPCI (ES1370)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +140,7 @@

config SOUND_ES1371
tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +153,7 @@

config SOUND_ESSSOLO1
tristate "ESS Technology Solo1"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the ESS Technology
Solo1 chip. To find out if your sound card uses a
@@ -149,7 +164,7 @@

config SOUND_MAESTRO
tristate "ESS Maestro, Maestro2, Maestro2E driver"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a sound system driven by ESS's Maestro line
of PCI sound chips. These include the Maestro 1, Maestro 2, and
@@ -158,7 +173,7 @@

config SOUND_MAESTRO3
tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
- depends on SOUND_PRIME && PCI && EXPERIMENTAL
+ depends on SOUND_PRIME && PCI && EXPERIMENTAL && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a sound system driven by ESS's Maestro 3
PCI sound chip.
@@ -172,14 +187,14 @@

config SOUND_HARMONY
tristate "PA Harmony audio driver"
- depends on GSC_LASI && SOUND_PRIME
+ depends on GSC_LASI && SOUND_PRIME && OBSOLETE_OSS_DRIVER
help
Say 'Y' or 'M' to include support for Harmony soundchip
on HP 712, 715/new and many other GSC based machines.

config SOUND_SONICVIBES
tristate "S3 SonicVibes"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a PCI sound card utilizing the S3
SonicVibes chipset. To find out if your sound card uses a
@@ -218,7 +233,7 @@

config SOUND_AU1000
tristate "Au1000 Sound"
- depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
+ depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && OBSOLETE_OSS_DRIVER

config SOUND_AU1550_AC97
tristate "Au1550 AC97 Sound"
@@ -492,7 +507,7 @@

config SOUND_VIA82CXXX
tristate "VIA 82C686 Audio Codec"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y here to include support for the audio codec found on VIA
82Cxxx-based chips. Typically these are built into a motherboard.

@@ -556,14 +571,14 @@

config SOUND_AD1889
tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)"
- depends on EXPERIMENTAL && SOUND_OSS && PCI
+ depends on EXPERIMENTAL && SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER
help
Say M here if you have a sound card based on the Analog Devices
AD1889 chip.



config SOUND_SGALAXY
tristate "Aztech Sound Galaxy (non-PnP) cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
This module initializes the older non Plug and Play sound galaxy
cards from Aztech. It supports the Waverider Pro 32 - 3D and the
@@ -599,7 +614,7 @@

config SOUND_CS4232
tristate "Crystal CS4232 based (PnP) cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a card based on the Crystal CS4232 chip set,
which uses its own Plug and Play protocol.
@@ -613,7 +628,7 @@

config SOUND_SSCAPE
tristate "Ensoniq SoundScape support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Answer Y if you have a sound card based on the Ensoniq SoundScape
chipset. Such cards are being manufactured at least by Ensoniq, Spea
@@ -625,7 +640,7 @@

config SOUND_GUS
tristate "Gravis Ultrasound support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here for any type of Gravis Ultrasound card, including the GUS
or GUS MAX. See also <file:Documentation/sound/oss/ultrasound> for more
@@ -727,7 +742,7 @@

config SOUND_NM256
tristate "NM256AV/NM256ZX audio support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say M here to include audio support for the NeoMagic 256AV/256ZX
chipsets. These are the audio chipsets found in the Sony
@@ -739,7 +754,7 @@

config SOUND_MAD16
tristate "OPTi MAD16 and/or Mozart based cards"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
---help---
Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
82C928 or 82C929 or 82C931) audio interface chip. These chips are
@@ -860,7 +875,7 @@

config SOUND_AWE32_SYNTH
tristate "AWE32 synth"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
similar sound card. See <file:Documentation/sound/oss/README.awe>,
@@ -870,7 +885,7 @@

config SOUND_WAVEFRONT
tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards"
- depends on SOUND_OSS && m
+ depends on SOUND_OSS && m && OBSOLETE_OSS_DRIVER
help
Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card
and read the files <file:Documentation/sound/oss/Wavefront> and
@@ -878,7 +893,7 @@

config SOUND_MAUI
tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez
sound card.
@@ -904,7 +919,7 @@

config SOUND_YM3812
tristate "Yamaha FM synthesizer (YM3812/OPL-3) support"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
---help---
Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
Answering Y is usually a safe and recommended choice, however some
@@ -920,7 +935,7 @@

config SOUND_OPL3SA1
tristate "Yamaha OPL3-SA1 audio controller"
- depends on SOUND_OSS
+ depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
usually built into motherboards. Read
@@ -946,7 +961,7 @@

config SOUND_YMFPCI
tristate "Yamaha YMF7xx PCI audio (native mode)"
- depends on SOUND_OSS && PCI
+ depends on SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER
help
Support for Yamaha cards including the YMF711, YMF715, YMF718,
YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital.
@@ -1088,11 +1103,11 @@

config SOUND_ALI5455
tristate "ALi5455 audio support"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER

config SOUND_FORTE
tristate "ForteMedia FM801 driver"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you want driver support for the ForteMedia FM801 PCI
audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1115,7 @@

config SOUND_RME96XX
tristate "RME Hammerfall (RME96XX) support"
- depends on SOUND_PRIME && PCI
+ depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
help
Say Y or M if you have a Hammerfall or Hammerfall light
multichannel card from RME. If you want to access advanced
@@ -1108,7 +1123,7 @@

config SOUND_AD1980
tristate "AD1980 front/back switch plugin"
- depends on SOUND_PRIME
+ depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER

config SOUND_SH_DAC_AUDIO
tristate "SuperH DAC audio support"

Andi Kleen

unread,
Oct 30, 2005, 1:07:20 PM10/30/05
to Adrian Bunk, linux-...@vger.kernel.org, ak...@osdl.org
Adrian Bunk <bu...@stusta.de> writes:

> This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> same hardware) for removal.
>
> Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.

I would prefer if the ICH driver be kept. It works just fine on near
all my systems and has a much smaller binary size than the ALSA
variant. Moving to ALSA would bloat the kernels considerably.

-Andi

Adrian Bunk

unread,
Oct 30, 2005, 1:38:45 PM10/30/05
to Andi Kleen, linux-...@vger.kernel.org, ak...@osdl.org
On Sun, Oct 30, 2005 at 07:06:39PM +0100, Andi Kleen wrote:
> Adrian Bunk <bu...@stusta.de> writes:
>
> > This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> > same hardware) for removal.
> >
> > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
>
> I would prefer if the ICH driver be kept. It works just fine on near
> all my systems and has a much smaller binary size than the ALSA
> variant. Moving to ALSA would bloat the kernels considerably.

???

$ ls -la sound/oss/i810_audio.o sound/pci/intel8x0.o
-rw-rw-r-- 1 bunk bunk 38056 2005-10-30 13:43 sound/oss/i810_audio.o
-rw-rw-r-- 1 bunk bunk 34344 2005-10-30 13:44 sound/pci/intel8x0.o
$

The general decision for the OSS -> ALSA move was long ago.

If you have a real issue with the ALSA driver please submit a proper
bug report to the ALSA bug tracking system and tell me the bug number.

> -Andi

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

Andi Kleen

unread,
Oct 30, 2005, 2:35:51 PM10/30/05
to Adrian Bunk, linux-...@vger.kernel.org, ak...@osdl.org
On Sunday 30 October 2005 19:38, Adrian Bunk wrote:

> ???
>
> $ ls -la sound/oss/i810_audio.o sound/pci/intel8x0.o
> -rw-rw-r-- 1 bunk bunk 38056 2005-10-30 13:43 sound/oss/i810_audio.o
> -rw-rw-r-- 1 bunk bunk 34344 2005-10-30 13:44 sound/pci/intel8x0.o
> $
>
> The general decision for the OSS -> ALSA move was long ago.

If you compare the complete size of ALSA+driver vs OSS+driver then
OSS wins easily on the bloat department.

> If you have a real issue with the ALSA driver please submit a proper
> bug report to the ALSA bug tracking system and tell me the bug number.

Avoiding bloat is a real issue.

-Andi

Adrian Bunk

unread,
Oct 30, 2005, 2:50:20 PM10/30/05
to Andi Kleen, linux-...@vger.kernel.org, ak...@osdl.org
On Sun, Oct 30, 2005 at 08:35:49PM +0100, Andi Kleen wrote:
> On Sunday 30 October 2005 19:38, Adrian Bunk wrote:
>
> > ???
> >
> > $ ls -la sound/oss/i810_audio.o sound/pci/intel8x0.o
> > -rw-rw-r-- 1 bunk bunk 38056 2005-10-30 13:43 sound/oss/i810_audio.o
> > -rw-rw-r-- 1 bunk bunk 34344 2005-10-30 13:44 sound/pci/intel8x0.o
> > $
> >
> > The general decision for the OSS -> ALSA move was long ago.
>
> If you compare the complete size of ALSA+driver vs OSS+driver then
> OSS wins easily on the bloat department.

If this is your problem then you should have vetoed the inclusion of
ALSA into the kernel.

> > If you have a real issue with the ALSA driver please submit a proper
> > bug report to the ALSA bug tracking system and tell me the bug number.
>
> Avoiding bloat is a real issue.

OK, what is your plan to make ALSA non-bloated?

E.g. it's clear that unused code or unused EXPORT_SYMBOL's in the kernel
are bloat, so I am working on eliminating such bloat.

If you consider ALSA too bloated you should help on solving this issue
instead of insisting on keeping OSS.

> -Andi

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

Lee Revell

unread,
Oct 31, 2005, 2:10:29 AM10/31/05
to Andi Kleen, Adrian Bunk, linux-...@vger.kernel.org, ak...@osdl.org
On Sun, 2005-10-30 at 19:06 +0100, Andi Kleen wrote:
> Adrian Bunk <bu...@stusta.de> writes:
>
> > This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> > same hardware) for removal.
> >
> > Scheduling the via82cxxx driver for removal was ACK'ed by Jeff Garzik.
>
> I would prefer if the ICH driver be kept. It works just fine on near
> all my systems and has a much smaller binary size than the ALSA
> variant. Moving to ALSA would bloat the kernels considerably.
>

The emu10k1 ALSA driver is considerably smaller than the OSS driver and
has more features, like most ALSA drivers. If the ICH driver is really
smaller I suspect it's missing some functionality.

Lee

Takashi Iwai

unread,
Oct 31, 2005, 6:10:00 AM10/31/05
to Adrian Bunk, Andi Kleen, linux-...@vger.kernel.org, ak...@osdl.org
At Sun, 30 Oct 2005 20:49:51 +0100,

Adrian Bunk wrote:
>
> > > If you have a real issue with the ALSA driver please submit a proper
> > > bug report to the ALSA bug tracking system and tell me the bug number.
> >
> > Avoiding bloat is a real issue.
>
> OK, what is your plan to make ALSA non-bloated?

The biggest part is the PCM middle layer. It's bold.
It's one of my TODO list to diet this one, especially for small
systems.

The amount of ac97 codec support code may be easily reduced, too, by
selecting codec chips to support. It's not a generic solution for
distributions but good for private built kernels.


Takashi

Nix

unread,
Oct 31, 2005, 11:01:59 AM10/31/05
to Adrian Bunk, linux-...@vger.kernel.org
On 30 Oct 2005, Adrian Bunk said:
> E.g. it's clear that unused code or unused EXPORT_SYMBOL's in the kernel
> are bloat, so I am working on eliminating such bloat.

And thank you very much for that!

What's most notable to me is a substantial cross-arch reduction in .data
space consumed. This non-FUSE-2.6.13 versus FUSE-2.6.14 UltraSPARC
comparison shows this effect clearly:

-rwxr-xr-x 1 root root 3460304 Oct 13 00:55 vmlinux-2.6.13.4
-rwxr-xr-x 1 root root 3190448 Oct 29 17:18 vmlinux-2.6.14

2.6.13.4 2.6.14
section size size diff
text 2330144 2341280 +10236
rodata 198361 199009 +648
pci_fixup 1536 1536 0
__ksymtab 32352 32336 -16
__ksymtab_gpl 3536 4048 +512
__kcrctab 0 0 0
__kcrctab_gpl 0 0 0
__ksymtab_strings 44688 45424 +736
__param 1640 1640 0
data 669288 387576 -281712
data.cacheline_aligned 704 704 0
data.read_mostly 428 13144 -12716
fixup 18256 18268 +12
__ex_table 15760 15768 +8
init.text 109728 94528 -15200
init.data 7280 8712 +1432
init.setup 792 816 +24
initcall.init 784 808 +24
con_initcall.init 16 16 0
security_initcall.init 0 0 0
init.ramfs 134 134 0
bss 226528 226152 -376
note.GNU-stack 0 0 0
__ex_table.1 216 216 0
__ex_table.2 16 496 +480
Total 3662187 3392611 -269576

On a similarly-configured Athlon the difference in .data is a little
less pronounced, but still there.

UltraSPARC 2.6.13.4 versus 2.6.14 at boot:

Memory: 511576k available (2280k kernel code, 936k data, 128k init) [fffff80000000000,0000000037ebc000]
Memory: 511848k available (2288k kernel code, 672k data, 112k init) [fffff80000000000,0000000037ebc000]

(that's 264K, the same as the .data size difference above)

Athlon 2.6.13.4 versus 2.6.14 at book:

Memory: 774828k/786432k available (2794k kernel code, 11156k reserved, 1022k data, 148k init, 0k highmem)
Memory: 774996k/786432k available (2833k kernel code, 10988k reserved, 808k data, 152k init, 0k highmem)

(that's 214K different in .data although kernel code has grown a little
here, probably thanks to FUSE).

Most OSes cannot claim to shrink across upgrades. Linux, at least the
kernel, can. :)

--
`"Gun-wielding recluse gunned down by local police" isn't the epitaph
I want. I am hoping for "Witnesses reported the sound up to two hundred
kilometers away" or "Last body part finally located".' --- James Nicoll

Michael Buesch

unread,
Oct 31, 2005, 11:28:03 AM10/31/05
to Nix, Adrian Bunk, linux-...@vger.kernel.org
On Monday 31 October 2005 16:59, you wrote:
> On 30 Oct 2005, Adrian Bunk said:
> > E.g. it's clear that unused code or unused EXPORT_SYMBOL's in the kernel
> > are bloat, so I am working on eliminating such bloat.
>
> And thank you very much for that!
>
> What's most notable to me is a substantial cross-arch reduction in .data
> space consumed. This non-FUSE-2.6.13 versus FUSE-2.6.14 UltraSPARC
> comparison shows this effect clearly:


> .data.read_mostly 428 13144 -12716
+12716


--
Greetings Michael.

Nix

unread,
Oct 31, 2005, 11:39:06 AM10/31/05
to Michael Buesch, Adrian Bunk, linux-...@vger.kernel.org
On Mon, 31 Oct 2005, Michael Buesch said:
>> .data.read_mostly 428 13144 -12716
> +12716

Um. Yes. Of course.

(I *knew* I should have automated that. Bah. *slaps self*)

Lee Revell

unread,
Oct 31, 2005, 11:52:47 AM10/31/05
to Adrian Bunk, Kyle McMartin, Andrew Morton, linux-...@vger.kernel.org
On Sun, 2005-10-30 at 16:12 +0100, Adrian Bunk wrote:
> On Sun, Oct 30, 2005 at 09:27:52AM -0500, Kyle McMartin wrote:
> > On Sun, Oct 30, 2005 at 11:51:18AM +0100, Adrian Bunk wrote:
> > >
> > > This patch schedules obsolete OSS drivers (with ALSA drivers that support the
> > > same hardware) for removal.
> > >
> >
> > I didn't see it here, but SOUND_AD1889 can definitely be removed
> > as well. The driver never worked properly to begin with. This was
> > ACK'd by the author last time this thread reared it's head.
>
> ALSA bugs [1] #1301 and #1302 are still open.

I think these bug reports can be disregarded. The submitter never
responded to requests to retest with the latest ALSA version. #1302 is
almost certainly a bug in kphone anyway.

Lee

Adrian Bunk

unread,
Nov 1, 2005, 9:56:13 AM11/1/05
to Lee Revell, Kyle McMartin, Andrew Morton, linux-...@vger.kernel.org
On Mon, Oct 31, 2005 at 11:50:52AM -0500, Lee Revell wrote:
> On Sun, 2005-10-30 at 16:12 +0100, Adrian Bunk wrote:
> >
> > ALSA bugs [1] #1301 and #1302 are still open.
>
> I think these bug reports can be disregarded. The submitter never
> responded to requests to retest with the latest ALSA version. #1302 is
> almost certainly a bug in kphone anyway.

If these bugs will be marked as resolved/closed when I'll send the next
batch of OSS driver removals a few months from now, SOUND_AD1816 will be
part of this batch.

> Lee

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

Reply all
Reply to author
Forward
0 new messages