Skip to contentSkip to conversation

the next round of scheduled OSS code removal

PATCH In review Adrian Bunk 2 participants 3 messages Jul 23, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 the next round of scheduled OSS code removal

This patch contains the next round of scheduled OSS code removal.

---

 Documentation/feature-removal-schedule.txt |    7 
 Documentation/sound/oss/es1371             |   64 
 MAINTAINERS                                |    7 
 sound/oss/Makefile                         |    1 
 sound/oss/dmasound/Makefile                |    6 
 sound/oss/dmasound/awacs_defs.h            |  251 -
 sound/oss/dmasound/dac3550a.c              |  209 -
 sound/oss/dmasound/dmasound.h              |   13 
 sound/oss/dmasound/dmasound_awacs.c        | 3215 ---------------------
 sound/oss/dmasound/dmasound_core.c         |  287 -
 sound/oss/dmasound/tas3001c.c              |  849 -----
 sound/oss/dmasound/tas3001c.h              |   64 
 sound/oss/dmasound/tas3001c_tables.c       |  375 --
 sound/oss/dmasound/tas3004.c               | 1138 -------
 sound/oss/dmasound/tas3004.h               |   77 
 sound/oss/dmasound/tas3004_tables.c        |  301 -
 sound/oss/dmasound/tas_common.c            |  214 -
 sound/oss/dmasound/tas_common.h            |  284 -
 sound/oss/dmasound/tas_eq_prefs.h          |   24 
 sound/oss/dmasound/tas_ioctl.h             |   23 
 sound/oss/dmasound/trans_16.c              |  898 -----
 sound/oss/es1371.c                         | 3131 --------------------
 22 files changed, 11438 deletions(-)
Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 -7
@@ -169,7 +169,0 @@
-What:  drivers depending on OBSOLETE_OSS
-When:  options in 2.6.22, code in 2.6.24
-Why:   OSS drivers with ALSA replacements
-Who:   Adrian Bunk <[email protected]>
-
----------------------------
-
MAINTAINERS renamed from MAINTAINERS.old +0 -7
@@ -2823,13 +2823,6 @@ L:	[email protected]
 L:	[email protected]
 S:	Supported
 
-PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
-P:	Thomas Sailer
-M:	[email protected]
-L:	[email protected]
-W:	http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
-S:	Maintained
-
 PCI SUBSYSTEM
 P:	Greg Kroah-Hartman
 M:	[email protected]
sound/oss/Makefile renamed from sound/oss/Makefile.old +0 -1
@@ -36,7 +36,6 @@ obj-$(CONFIG_SOUND_MSNDCLAS)	+= msnd.o m
 obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o
 obj-$(CONFIG_SOUND_VWSND)	+= vwsnd.o
 obj-$(CONFIG_SOUND_ICH)		+= i810_audio.o ac97_codec.o
-obj-$(CONFIG_SOUND_ES1371)	+= es1371.o ac97_codec.o
 obj-$(CONFIG_SOUND_VRC5477)	+= nec_vrc5477.o ac97_codec.o
 obj-$(CONFIG_SOUND_AU1550_AC97)	+= au1550_ac97.o ac97_codec.o
 obj-$(CONFIG_SOUND_TRIDENT)	+= trident.o ac97_codec.o
sound/oss/dmasound/Makefile renamed from sound/oss/dmasound/Makefile.old +0 -6
@@ -2,12 +2,6 @@
 # Makefile for the DMA sound driver
 #
 
-dmasound_pmac-y			+= dmasound_awacs.o \
-				   trans_16.o dac3550a.o tas_common.o \
-				   tas3001c.o tas3001c_tables.o \
-				   tas3004.o tas3004_tables.o
-
 obj-$(CONFIG_DMASOUND_ATARI)	+= dmasound_core.o dmasound_atari.o
-obj-$(CONFIG_DMASOUND_PMAC)	+= dmasound_core.o dmasound_pmac.o
 obj-$(CONFIG_DMASOUND_PAULA)	+= dmasound_core.o dmasound_paula.o
 obj-$(CONFIG_DMASOUND_Q40)	+= dmasound_core.o dmasound_q40.o
sound/oss/dmasound/dmasound.h renamed from sound/oss/dmasound/dmasound.h.old +0 -13
@@ -59,7 +59,6 @@ static inline int ioctl_return(int __use
      */
 
 #undef HAS_8BIT_TABLES
-#undef HAS_RECORD
 
 #if defined(CONFIG_DMASOUND_ATARI) || defined(CONFIG_DMASOUND_ATARI_MODULE) ||\
     defined(CONFIG_DMASOUND_PAULA) || defined(CONFIG_DMASOUND_PAULA_MODULE) ||\
@@ -83,10 +82,6 @@ static inline int ioctl_return(int __use
 #define DEFAULT_N_BUFFERS 4
 #define DEFAULT_BUFF_SIZE (1<<15)
 
-#if defined(CONFIG_DMASOUND_PMAC) || defined(CONFIG_DMASOUND_PMAC_MODULE)
-#define HAS_RECORD
-#endif
-
     /*
      *  Initialization
      */
@@ -168,9 +163,6 @@ struct sound_settings {
     SETTINGS soft;	/* software settings */
     SETTINGS dsp;	/* /dev/dsp default settings */
     TRANS *trans_write;	/* supported translations */
-#ifdef HAS_RECORD
-    TRANS *trans_read;	/* supported translations */
-#endif
     int volume_left;	/* volume (range is machine dependent) */
     int volume_right;
     int bass;		/* tone (range is machine dependent) */
@@ -253,11 +245,6 @@ struct sound_queue {
 extern struct sound_queue dmasound_write_sq;
 #define write_sq	dmasound_write_sq
 
-#ifdef HAS_RECORD
-extern struct sound_queue dmasound_read_sq;
-#define read_sq		dmasound_read_sq
-#endif
-
 extern int dmasound_catchRadius;
 #define catchRadius	dmasound_catchRadius
 
sound/oss/dmasound/dmasound_core.c renamed from sound/oss/dmasound/dmasound_core.c.old +0 -287

440 lines not on this page · raw message

Documentation/sound/oss/es1371 deleted +0 -64

64 lines not on this page · raw message

sound/oss/es1371.c deleted +0 -3131

2,420 lines not on this page · raw message

sound/oss/dmasound/awacs_defs.h deleted +0 -251

251 lines not on this page · raw message

sound/oss/dmasound/dmasound_awacs.c deleted +0 -3215

3,215 lines not on this page · raw message

sound/oss/dmasound/trans_16.c deleted +0 -898

898 lines not on this page · raw message

sound/oss/dmasound/dac3550a.c deleted +0 -209

209 lines not on this page · raw message

sound/oss/dmasound/tas_common.h deleted +0 -284

284 lines not on this page · raw message

sound/oss/dmasound/tas_common.c deleted +0 -214

214 lines not on this page · raw message

sound/oss/dmasound/tas_eq_prefs.h deleted +0 -24

Lines of this file are not shown. View the raw message.

sound/oss/dmasound/tas3001c.h deleted +0 -64

64 lines not on this page · raw message

sound/oss/dmasound/tas_ioctl.h deleted +0 -23

Lines of this file are not shown. View the raw message.

sound/oss/dmasound/tas3001c.c deleted +0 -849

849 lines not on this page · raw message

sound/oss/dmasound/tas3001c_tables.c deleted +0 -375

375 lines not on this page · raw message

sound/oss/dmasound/tas3004.h deleted +0 -77

77 lines not on this page · raw message

sound/oss/dmasound/tas3004.c deleted +0 -1138

1,138 lines not on this page · raw message

sound/oss/dmasound/tas3004_tables.c deleted +0 -301

301 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 1 line · Adrian Bunk

This patch contains the next round of scheduled OSS code removal.

Er... There are e.g. m68k dmasound drivers; with dmasound_core gone they won't survive, AFAICS...

#2 lore raw
Quoted 5 lines · Al Viro
Quoted 1 line · Adrian Bunk

This patch contains the next round of scheduled OSS code removal.

Er... There are e.g. m68k dmasound drivers; with dmasound_core gone they won't survive, AFAICS...

Look at my patch, dmasound_core isn't gone.

cu
Adrian

Signature · 4 lines
       "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