| Message ID | 20230421141006.1005452-3-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d4af7ca20173e61b77584e4f2025387b7b76ef75 |
| Headers | show |
| Series | [1/7] ALSA: emu10k1: drop redundant snd_emu10k1_efx_playback_hw_free() | expand |
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 39787fecc8d9..9a6ede9ac18a 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1691,7 +1691,6 @@ struct snd_emu10k1 { unsigned int revision; /* chip revision */ unsigned int serial; /* serial number */ unsigned short model; /* subsystem id */ - unsigned int card_type; /* EMU10K1_CARD_* */ unsigned int ecard_ctrl; /* ecard control bits */ unsigned int address_mode; /* address mode */ unsigned long dma_mask; /* PCI DMA mask */ diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index 1c1f1dd44611..c2414bd5aecd 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -15,9 +15,6 @@ * ---- FX8010 ---- */ -#define EMU10K1_CARD_CREATIVE 0x00000000 -#define EMU10K1_CARD_EMUAPS 0x00000001 - #define EMU10K1_FX8010_PCM_COUNT 8 /*
The use of the variable was removed in commit 2b637da5a1b ("clean up card features"). That commit also broke user space (the ioctl structure), at which point the defines became meaningless, so I don't think purging them is a problem. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> --- include/sound/emu10k1.h | 1 - include/uapi/sound/emu10k1.h | 3 --- 2 files changed, 4 deletions(-)