remove saa7134-oss
RFC PATCH 1/1 remove saa7134-oss
The saa7134-oss is deprecated for quite some time, it's the only remaining OSS user outside of sound/oss/, and considering how few and what kind of soundcards are left supported by OSS I hardly see any use cases left.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/media/video/saa7134/Kconfig | 12 drivers/media/video/saa7134/Makefile | 1 drivers/media/video/saa7134/saa7134-alsa.c | 16 drivers/media/video/saa7134/saa7134-oss.c | 1046 --------------------- 4 files changed, 3 insertions(+), 1072 deletions(-)
af0dddd4de650322637130a9187df916572df374
drivers/media/video/saa7134/Kconfig +0 -12
@@ -23,18 +23,6 @@ config VIDEO_SAA7134_ALSA To compile this driver as a module, choose M here: the module will be called saa7134-alsa. -config VIDEO_SAA7134_OSS - tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)" - depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA - ---help--- - This is a video4linux driver for direct (DMA) audio in - Philips SAA713x based TV cards using OSS - - This is deprecated in favor of the ALSA module - - To compile this driver as a module, choose M here: the - module will be called saa7134-oss. - config VIDEO_SAA7134_DVB tristate "DVB/ATSC Support for saa7134 based TV cards" depends on VIDEO_SAA7134 && DVB_CORE
drivers/media/video/saa7134/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o \ saa6752hs.o obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o -obj-$(CONFIG_VIDEO_SAA7134_OSS) += saa7134-oss.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
drivers/media/video/saa7134/saa7134-alsa.c +3 -13
@@ -1069,24 +1069,14 @@ static int saa7134_alsa_init(void)struct saa7134_dev *dev =NULL ;struct list_head *list; -if (!saa7134_dmasound_init && !saa7134_dmasound_exit) { - saa7134_dmasound_init = alsa_device_init; - saa7134_dmasound_exit = alsa_device_exit; - }else { -printk (KERN_WARNING "saa7134 ALSA: can't load, DMA sound handler already assigned (probably to OSS)\n" ); -return -EBUSY ; - } + saa7134_dmasound_init = alsa_device_init; + saa7134_dmasound_exit = alsa_device_exit;printk (KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n" );list_for_each (list,&saa7134_devlist) { dev = list_entry(list, struct saa7134_dev, devlist); -if (dev->dmasound.priv_data ==NULL ) { -alsa_device_init (dev); - }else { -printk (KERN_ERR "saa7134 ALSA: DMA sound is being handled by OSS. ignoring %s\n" ,dev->name); -return -EBUSY ; - } +alsa_device_init (dev); }if (dev ==NULL )
drivers/media/video/saa7134/saa7134-oss.c deleted +0 -1046
1,046 lines not on this page · raw message
Hi Adrian,
Em Sex, 2007-11-09 às 07:03 +0100, Adrian Bunk escreveu:
Quoted 4 lines
The saa7134-oss is deprecated for quite some time, it's the only remaining OSS user outside of
sound/oss/, and considering how few and what kind of soundcards are left supported by OSS I hardly see any use cases left.
Since saa7134-alsa seems to do the job, it seems ok to remove saa7134-oss.
Quoted 1 line
Signed-off-by Adrian Bunk <[email protected]>
I'll commit this patch soon at my tree.
Cheers,
Mauro