Skip to content

Commit 34ce71a

Browse files
alexandrebellonitiwai
authored andcommitted
ALSA: timer: remove legacy rtctimer
There are no users of rtctimer left. Remove its code as this is the in-kernel user of the legacy PC RTC driver that will hopefully be removed at some point. Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent b610386 commit 34ce71a

File tree

6 files changed

+1
-222
lines changed

6 files changed

+1
-222
lines changed

include/uapi/sound/asound.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ enum {
672672

673673
/* global timers (device member) */
674674
#define SNDRV_TIMER_GLOBAL_SYSTEM 0
675-
#define SNDRV_TIMER_GLOBAL_RTC 1
675+
#define SNDRV_TIMER_GLOBAL_RTC 1 /* unused */
676676
#define SNDRV_TIMER_GLOBAL_HPET 2
677677
#define SNDRV_TIMER_GLOBAL_HRTIMER 3
678678

sound/core/Kconfig

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -141,35 +141,6 @@ config SND_SEQ_HRTIMER_DEFAULT
141141
Say Y here to use the HR-timer backend as the default sequencer
142142
timer.
143143

144-
config SND_RTCTIMER
145-
tristate "RTC Timer support"
146-
depends on RTC
147-
select SND_TIMER
148-
help
149-
Say Y here to enable RTC timer support for ALSA. ALSA uses
150-
the RTC timer as a precise timing source and maps the RTC
151-
timer to ALSA's timer interface. The ALSA sequencer code also
152-
can use this timing source.
153-
154-
To compile this driver as a module, choose M here: the module
155-
will be called snd-rtctimer.
156-
157-
Note that this option is exclusive with the new RTC drivers
158-
(CONFIG_RTC_CLASS) since this requires the old API.
159-
160-
config SND_SEQ_RTCTIMER_DEFAULT
161-
bool "Use RTC as default sequencer timer"
162-
depends on SND_RTCTIMER && SND_SEQUENCER
163-
depends on !SND_SEQ_HRTIMER_DEFAULT
164-
default y
165-
help
166-
Say Y here to use the RTC timer as the default sequencer
167-
timer. This is strongly recommended because it ensures
168-
precise MIDI timing even when the system timer runs at less
169-
than 1000 Hz.
170-
171-
If in doubt, say Y.
172-
173144
config SND_DYNAMIC_MINORS
174145
bool "Dynamic device file minor numbers"
175146
help

sound/core/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ obj-$(CONFIG_SND) += snd.o
3737
obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
3838
obj-$(CONFIG_SND_TIMER) += snd-timer.o
3939
obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
40-
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
4140
obj-$(CONFIG_SND_PCM) += snd-pcm.o
4241
obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
4342
obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o

sound/core/rtctimer.c

Lines changed: 0 additions & 187 deletions
This file was deleted.

sound/core/seq/seq.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ int seq_default_timer_card = -1;
4747
int seq_default_timer_device =
4848
#ifdef CONFIG_SND_SEQ_HRTIMER_DEFAULT
4949
SNDRV_TIMER_GLOBAL_HRTIMER
50-
#elif defined(CONFIG_SND_SEQ_RTCTIMER_DEFAULT)
51-
SNDRV_TIMER_GLOBAL_RTC
5250
#else
5351
SNDRV_TIMER_GLOBAL_SYSTEM
5452
#endif

sound/core/timer.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737

3838
#if IS_ENABLED(CONFIG_SND_HRTIMER)
3939
#define DEFAULT_TIMER_LIMIT 4
40-
#elif IS_ENABLED(CONFIG_SND_RTCTIMER)
41-
#define DEFAULT_TIMER_LIMIT 2
4240
#else
4341
#define DEFAULT_TIMER_LIMIT 1
4442
#endif

0 commit comments

Comments
 (0)