github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: gus: Remove deadcode

Browse Source 
snd_gus_use_dec(), snd_gus_use_inc() and snd_gf1_print_voice_registers()
last uses were removed in 2007 by
commit e5723b41ab ("[ALSA] Remove sequencer instrument layer")

Remove them.

While there, remove big #if 0 blocks next to the code being deleted.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Link: https://patch.msgid.link/20250508000225.195766-1-linux@treblig.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Dr. David Alan Gilbert 2025-05-08 01:02:25 +01:00 committed by Takashi Iwai
parent 28a09d9e42
commit 5d51fdd122
3 changed files with 0 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/gus.h
View File

@ -578,14 +578,8 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus);
int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index);
#ifdef CONFIG_SND_DEBUG
extern void snd_gf1_print_voice_registers(struct snd_gus_card * gus);
#endif
/* gus.c */
int snd_gus_use_inc(struct snd_gus_card * gus);
void snd_gus_use_dec(struct snd_gus_card * gus);
int snd_gus_create(struct snd_card *card,
unsigned long port,
int irq, int dma1, int dma2,

229
sound/isa/gus/gus_io.c
View File

@ -228,49 +228,6 @@ unsigned short snd_gf1_i_look16(struct snd_gus_card * gus, unsigned char reg)
return res;
}
#if 0
void snd_gf1_i_adlib_write(struct snd_gus_card * gus,
unsigned char reg,
unsigned char data)
{
unsigned long flags;
spin_lock_irqsave(&gus->reg_lock, flags);
__snd_gf1_adlib_write(gus, reg, data);
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
void snd_gf1_i_write_addr(struct snd_gus_card * gus, unsigned char reg,
unsigned int addr, short w_16bit)
{
unsigned long flags;
spin_lock_irqsave(&gus->reg_lock, flags);
__snd_gf1_write_addr(gus, reg, addr, w_16bit);
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
#endif /* 0 */
#ifdef CONFIG_SND_DEBUG
static unsigned int snd_gf1_i_read_addr(struct snd_gus_card * gus,
unsigned char reg, short w_16bit)
{
unsigned int res;
unsigned long flags;
spin_lock_irqsave(&gus->reg_lock, flags);
res = __snd_gf1_read_addr(gus, reg, w_16bit);
spin_unlock_irqrestore(&gus->reg_lock, flags);
return res;
}
#endif
/*
*/
void snd_gf1_dram_addr(struct snd_gus_card * gus, unsigned int addr)
{
outb(0x43, gus->gf1.reg_regsel);
@ -418,189 +375,3 @@ void snd_gf1_select_active_voices(struct snd_gus_card * gus)
udelay(100);
}
}
#ifdef CONFIG_SND_DEBUG
void snd_gf1_print_voice_registers(struct snd_gus_card * gus)
{
unsigned char mode;
int voice, ctrl;
voice = gus->gf1.active_voice;
dev_info(gus->card->dev,
" -%i- GF1 voice ctrl, ramp ctrl = 0x%x, 0x%x\n",
voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d));
dev_info(gus->card->dev,
" -%i- GF1 frequency = 0x%x\n",
voice, snd_gf1_i_read16(gus, 1));
dev_info(gus->card->dev,
" -%i- GF1 loop start, end = 0x%x (0x%x), 0x%x (0x%x)\n",
voice, snd_gf1_i_read_addr(gus, 2, ctrl & 4),
snd_gf1_i_read_addr(gus, 2, (ctrl & 4) ^ 4),
snd_gf1_i_read_addr(gus, 4, ctrl & 4),
snd_gf1_i_read_addr(gus, 4, (ctrl & 4) ^ 4));
dev_info(gus->card->dev,
" -%i- GF1 ramp start, end, rate = 0x%x, 0x%x, 0x%x\n",
voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8),
snd_gf1_i_read8(gus, 6));
dev_info(gus->card->dev,
" -%i- GF1 volume = 0x%x\n",
voice, snd_gf1_i_read16(gus, 9));
dev_info(gus->card->dev,
" -%i- GF1 position = 0x%x (0x%x)\n",
voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl & 4),
snd_gf1_i_read_addr(gus, 0x0a, (ctrl & 4) ^ 4));
if (gus->interwave && snd_gf1_i_read8(gus, 0x19) & 0x01) { /* enhanced mode */
mode = snd_gf1_i_read8(gus, 0x15);
dev_info(gus->card->dev,
" -%i- GFA1 mode = 0x%x\n",
voice, mode);
if (mode & 0x01) { /* Effect processor */
dev_info(gus->card->dev,
" -%i- GFA1 effect address = 0x%x\n",
voice, snd_gf1_i_read_addr(gus, 0x11, ctrl & 4));
dev_info(gus->card->dev,
" -%i- GFA1 effect volume = 0x%x\n",
voice, snd_gf1_i_read16(gus, 0x16));
dev_info(gus->card->dev,
" -%i- GFA1 effect volume final = 0x%x\n",
voice, snd_gf1_i_read16(gus, 0x1d));
dev_info(gus->card->dev,
" -%i- GFA1 effect accumulator = 0x%x\n",
voice, snd_gf1_i_read8(gus, 0x14));
}
if (mode & 0x20) {
dev_info(gus->card->dev,
" -%i- GFA1 left offset = 0x%x (%i)\n",
voice, snd_gf1_i_read16(gus, 0x13),
snd_gf1_i_read16(gus, 0x13) >> 4);
dev_info(gus->card->dev,
" -%i- GFA1 left offset final = 0x%x (%i)\n",
voice, snd_gf1_i_read16(gus, 0x1c),
snd_gf1_i_read16(gus, 0x1c) >> 4);
dev_info(gus->card->dev,
" -%i- GFA1 right offset = 0x%x (%i)\n",
voice, snd_gf1_i_read16(gus, 0x0c),
snd_gf1_i_read16(gus, 0x0c) >> 4);
dev_info(gus->card->dev,
" -%i- GFA1 right offset final = 0x%x (%i)\n",
voice, snd_gf1_i_read16(gus, 0x1b),
snd_gf1_i_read16(gus, 0x1b) >> 4);
} else
dev_info(gus->card->dev,
" -%i- GF1 pan = 0x%x\n",
voice, snd_gf1_i_read8(gus, 0x0c));
} else
dev_info(gus->card->dev,
" -%i- GF1 pan = 0x%x\n",
voice, snd_gf1_i_read8(gus, 0x0c));
}
#if 0
void snd_gf1_print_global_registers(struct snd_gus_card * gus)
{
unsigned char global_mode = 0x00;
dev_info(gus->card->dev,
" -G- GF1 active voices = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES));
if (gus->interwave) {
global_mode = snd_gf1_i_read8(gus, SNDRV_GF1_GB_GLOBAL_MODE);
dev_info(gus->card->dev,
" -G- GF1 global mode = 0x%x\n",
global_mode);
}
if (global_mode & 0x02) /* LFO enabled? */
dev_info(gus->card->dev,
" -G- GF1 LFO base = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE));
dev_info(gus->card->dev,
" -G- GF1 voices IRQ read = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ));
dev_info(gus->card->dev,
" -G- GF1 DRAM DMA control = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL));
dev_info(gus->card->dev,
" -G- GF1 DRAM DMA high/low = 0x%x/0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH),
snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW));
dev_info(gus->card->dev,
" -G- GF1 DRAM IO high/low = 0x%x/0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH),
snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW));
if (!gus->interwave)
dev_info(gus->card->dev,
" -G- GF1 record DMA control = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL));
dev_info(gus->card->dev,
" -G- GF1 DRAM IO 16 = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16));
if (gus->gf1.enh_mode) {
dev_info(gus->card->dev,
" -G- GFA1 memory config = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG));
dev_info(gus->card->dev,
" -G- GFA1 memory control = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL));
dev_info(gus->card->dev,
" -G- GFA1 FIFO record base = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR));
dev_info(gus->card->dev,
" -G- GFA1 FIFO playback base = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR));
dev_info(gus->card->dev,
" -G- GFA1 interleave control = 0x%x\n",
snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE));
}
}
void snd_gf1_print_setup_registers(struct snd_gus_card * gus)
{
dev_info(gus->card->dev,
" -S- mix control = 0x%x\n",
inb(GUSP(gus, MIXCNTRLREG)));
dev_info(gus->card->dev,
" -S- IRQ status = 0x%x\n",
inb(GUSP(gus, IRQSTAT)));
dev_info(gus->card->dev,
" -S- timer control = 0x%x\n",
inb(GUSP(gus, TIMERCNTRL)));
dev_info(gus->card->dev,
" -S- timer data = 0x%x\n",
inb(GUSP(gus, TIMERDATA)));
dev_info(gus->card->dev,
" -S- status read = 0x%x\n",
inb(GUSP(gus, REGCNTRLS)));
dev_info(gus->card->dev,
" -S- Sound Blaster control = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL));
dev_info(gus->card->dev,
" -S- AdLib timer 1/2 = 0x%x/0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1),
snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2));
dev_info(gus->card->dev,
" -S- reset = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET));
if (gus->interwave) {
dev_info(gus->card->dev,
" -S- compatibility = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY));
dev_info(gus->card->dev,
" -S- decode control = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL));
dev_info(gus->card->dev,
" -S- version number = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER));
dev_info(gus->card->dev,
" -S- MPU-401 emul. control A/B = 0x%x/0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A),
snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B));
dev_info(gus->card->dev,
" -S- emulation IRQ = 0x%x\n",
snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ));
}
}
#endif /* 0 */
#endif

14
sound/isa/gus/gus_main.c
View File

@ -22,18 +22,6 @@ MODULE_LICENSE("GPL");
static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches);
int snd_gus_use_inc(struct snd_gus_card * gus)
{
if (!try_module_get(gus->card->module))
return 0;
return 1;
}
void snd_gus_use_dec(struct snd_gus_card * gus)
{
module_put(gus->card->module);
}
static int snd_gus_joystick_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@ -443,8 +431,6 @@ EXPORT_SYMBOL(snd_gf1_new_mixer);
/* gus_pcm.c */
EXPORT_SYMBOL(snd_gf1_pcm_new);
/* gus.c */
EXPORT_SYMBOL(snd_gus_use_inc);
EXPORT_SYMBOL(snd_gus_use_dec);
EXPORT_SYMBOL(snd_gus_create);
EXPORT_SYMBOL(snd_gus_initialize);
/* gus_irq.c */