linux.git/sound/drivers, branch v4.13-rc2

ALSA: opl4: Move inline before return type

2017-07-06T07:24:17+00:00

Make the code like the rest of the kernel.

Signed-off-by: Joe Perches 
Acked-by: Clemens Ladisch 
Signed-off-by: Takashi Iwai

ALSA: Fix forgotten dependency fix for tristate OSS sequencer kconfig

2017-06-28T06:45:07+00:00

In the commit 3d774d5ef066 ("ALSA: seq: Allow the tristate build of
OSS emulation") we changed CONFIG_SND_SEQUENCER_OSS to tristate, but a
couple of places were forgotten, namely, opl3 and emux Makefile.
These contain the line like
  snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o
and this doesn't work any longer as expected because snd-opl3-synth
can be built-in while CONFIG_SND_SEQUENCER_OSS=m.

This patch fixes these places to build properly for the new kconfig
dependency.  In the end, we had to use ifneq() to satisfy the
requirement.  It's a bit ugly, but lesser evil.

Fixes: 3d774d5ef066 ("ALSA: seq: Allow the tristate build of OSS emulation")
Reported-by: kbuild test robot 
Signed-off-by: Takashi Iwai

ALSA: seq: Allow the modular sequencer registration

2017-06-12T06:43:33+00:00

Many drivers bind the sequencer stuff in off-load by another driver
module, so that it's loaded only on demand.  In the current code, this
mechanism doesn't work when the driver is built-in while the sequencer
is module.  We check with IS_REACHABLE() and enable only when the
sequencer is in the same level of build.

However, this is basically a overshoot.  The binder code
(snd-seq-device) is an individual module from the sequencer core
(snd-seq), and we just have to make the former a built-in while
keeping the latter a module for allowing the scenario like the above.

This patch achieves that by rewriting Kconfig slightly.  Now, a driver
that provides the manual sequencer device binding should select
CONFIG_SND_SEQ_DEVICE in a way as
	select SND_SEQ_DEVICE if SND_SEQUENCER != n

Note that the "!=n" is needed here to avoid the influence of the
sequencer core is module while the driver is built-in.

Also, since rawmidi.o may be linked with snd_seq_device.o when
built-in, we have to shuffle the code to make the linker happy.
(the kernel linker isn't smart enough yet to handle such a case.)
That is, snd_seq_device.c is moved to sound/core from sound/core/seq,
as well as Makefile.

Last but not least, the patch replaces the code using IS_REACHABLE()
with IS_ENABLED(), since now the condition meets always when enabled.

Signed-off-by: Takashi Iwai

ALSA: seq: Reorganize kconfig and build

2017-06-09T20:10:06+00:00

This is a slightly intensive rewrite of Kconfig and Makefile about
ALSA sequencer stuff.

The first major change is that the kconfig items for the sequencer are
moved to sound/core/seq/Kconfig.  OK, that's easy.

The substantial change is that, instead of hackish top-level module
selection in Makefile, we define a Kconfig item for each sequencer
module.  The driver that requires such sequencer components select
exclusively the kconfig items.  This is more straightforward and
standard way.

Signed-off-by: Takashi Iwai

ALSA: seq: Allow the tristate build of OSS emulation

2017-06-09T20:09:45+00:00

Currently OSS sequencer emulation is tied with ALSA sequencer core,
both are built in the same level; i.e. when CONFIG_SND_SEQUENCER=y,
the OSS sequencer emulation is also always built-in, even though the
functionality can be built as an individual module.

This patch changes the rule and allows users to build snd-seq-oss
module while others are built-in.  Essentially, it's just a few simple
changes in Kconfig and Makefile.  Some driver codes like opl3 need to
convert from the simple ifdef to IS_ENABLED().  But that's all.

You might wonder how about the dependency: right, it can be messy, but
it still works.  Since we rewrote the sequencer binding with the
standard bus, the driver can be bound at any time on demand.  So, the
synthesizer driver module can be loaded individually from the OSS
emulation core before/after it.

Signed-off-by: Takashi Iwai

ALSA: vx: vx_pcm: constify vx_pcm_playback_ops and vx_pcm_capture_ops.

2017-06-09T07:20:37+00:00

File size before:
   text	   data	    bss	    dec	    hex	filename
   7126	    240	      0	   7366	   1cc6	sound/drivers/vx/vx_pcm.o

File size After adding 'const':
   text	   data	    bss	    dec	    hex	filename
   7382	      0	      0	   7382	   1cd6	sound/drivers/vx/vx_pcm.o

Signed-off-by: Arvind Yadav 
Signed-off-by: Takashi Iwai

ALSA : pcsp: pcsp_lib: constify snd_pcsp_playback_ops

2017-06-09T07:19:41+00:00

File size before:
   text	   data	    bss	    dec	    hex	filename
   2027	    168	      1	   2196	    894	sound/drivers/pcsp/pcsp_lib.o

File size After:
   text	   data	    bss	    dec	    hex	filename
   2155	     40	      1	   2196	    894	sound/drivers/pcsp/pcsp_lib.o

Signed-off-by: Arvind Yadav 
Signed-off-by: Takashi Iwai

ALSA: dummy: Convert to new PCM copy ops

2017-06-02T17:37:56+00:00

It's a dummy ops, so just replacing it.

Reviewed-by: Takashi Sakamoto 
Signed-off-by: Takashi Iwai

ALSA: declare snd_kcontrol_new structures as const

2017-05-30T08:29:25+00:00

Declare snd_kcontrol_new structures as const as they are only passed an
argument to the function snd_ctl_new1. This argument is of type const,
so snd_kcontrol_new structures having this property can be made const.
Done using Coccinelle:

@r disable optional_qualifier@
identifier x;
position p;
@@
static struct snd_kcontrol_new x@p={...};

@ok@
identifier r.x;
position p;
@@
snd_ctl_new1(&x@p,...)

@bad@
position p != {r.p,ok.p};
identifier r.x;
@@
x@p

@depends on !bad disable optional_qualifier@
identifier r.x;
@@
+const
struct snd_kcontrol_new x;

Cross compiled these files:
sound/aoa/codecs/tas.c - powerpc
sound/mips/{hal2.c/sgio2audio.c} - mips
sound/ppc/{awacs.c/beep.c/tumbler.c} - powerpc
sound/soc/sh/siu_dai.c - sh
Could not find an architecture to compile sound/sh/aica.c.

Signed-off-by: Bhumika Goyal 
Acked-by: Mark Brown 
Signed-off-by: Takashi Iwai

ALSA: opl3: Kill unused set_fs()

2017-05-17T05:13:12+00:00

snd_enter_user() and snd_leave_user() that call set_fs() are the dead
code in opl3 driver.  Let's rip them off.

Reviewed-by: Takashi Sakamoto 
Signed-off-by: Takashi Iwai