OSDN Git Service

ALSA: emu10k1: Make uapi/emu10k1.h compilable again
authorTakashi Iwai <tiwai@suse.de>
Fri, 20 Dec 2019 15:34:11 +0000 (16:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 20 Dec 2019 15:45:10 +0000 (16:45 +0100)
commit2e4688676392767e16c1adeca4cc2c083e2db13f
tree714a6ac47ef91fcfe758c202808a1dcbecdd8158
parenta032ff0e8065668e672eb2e223e265b7808f35a3
ALSA: emu10k1: Make uapi/emu10k1.h compilable again

Recently we updated the content in alsa-lib uapi header files by just
copying from the latest Linus kernel uapi/*.h, and noticed that it
broke the build of some alsa-tools programs.  The reason is that we
used to have a modified version in the past, so that the program can
be built without referring to the unexported stuff like
snd_ctl_elem_id or __user prefix.

This patch attempts to restore that, i.e. dropping the stuff that
can't be referred in the user-space.  For adapting the changes in
uapi/emu10k1.h, the emu10k1 driver code is also slightly modified.
Most of changes are pointer cast.

Link: https://lore.kernel.org/r/20191220153415.2740-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/uapi/sound/emu10k1.h
sound/pci/emu10k1/emufx.c