]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: emu10k1: remove obsolete card type variable and defines
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Fri, 21 Apr 2023 14:10:02 +0000 (16:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 22 Apr 2023 08:40:39 +0000 (10:40 +0200)
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>
Link: https://lore.kernel.org/r/20230421141006.1005452-3-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/emu10k1.h
include/uapi/sound/emu10k1.h

index 3407ca4a12109b71cecb6af4c81146e2fa442443..ddc1e71a8de50b8b8d434d86349c1c1bd5928535 100644 (file)
@@ -1689,7 +1689,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 */
index 1c1f1dd446118ea457dc155ef6b26f6e2c9162fb..c2414bd5aecdee0e19b7921acdd750fdba6ca89f 100644 (file)
@@ -15,9 +15,6 @@
  * ---- FX8010 ----
  */
 
-#define EMU10K1_CARD_CREATIVE                  0x00000000
-#define EMU10K1_CARD_EMUAPS                    0x00000001
-
 #define EMU10K1_FX8010_PCM_COUNT               8
 
 /*