June 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: samsung: Odroid DT binding documentation corrections
by Sylwester Nawrocki 09 Jun '17

09 Jun '17

This patch removes unused and undocumented samsung,cpu-dai, samsung,codec-dai properties from the dts example and moves sub-nodes' description to a separate section. Suggested-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- .../devicetree/bindings/sound/samsung,odroid.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.txt b/Documentation/devicetree/bindings/sound/samsung,odroid.txt index c1ac70c..c30934d 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.txt +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.txt @@ -5,11 +5,6 @@ Required properties: - compatible - "samsung,odroidxu3-audio" - for Odroid XU3 board, "samsung,odroidxu4-audio" - for Odroid XU4 board - model - the user-visible name of this sound complex - - 'cpu' subnode with a 'sound-dai' property containing the phandle of the I2S - controller - - 'codec' subnode with a 'sound-dai' property containing list of phandles - to the CODEC nodes, first entry must be corresponding to the MAX98090 - CODEC and the second entry must be the phandle of the HDMI IP block node - clocks - should contain entries matching clock names in the clock-names property - clock-names - should contain following entries: @@ -32,12 +27,18 @@ Required properties: For Odroid XU4: no entries +Required sub-nodes: + + - 'cpu' subnode with a 'sound-dai' property containing the phandle of the I2S + controller + - 'codec' subnode with a 'sound-dai' property containing list of phandles + to the CODEC nodes, first entry must be corresponding to the MAX98090 + CODEC and the second entry must be the phandle of the HDMI IP block node + Example: sound { compatible = "samsung,odroidxu3-audio"; - samsung,cpu-dai = <&i2s0>; - samsung,codec-dai = <&max98090>; model = "Odroid-XU3"; samsung,audio-routing = "Headphone Jack", "HPL", -- 1.9.1

2 1

[alsa-devel] [PATCH v1] ASoC: omap-mcbsp: Use sysfs_match_string() helper
by Andy Shevchenko 09 Jun '17

09 Jun '17

Use sysfs_match_string() helper instead of open coded variant. Cc: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Cc: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- sound/soc/omap/mcbsp.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index 06fec5699cc8..7a54e3083203 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c @@ -835,15 +835,11 @@ static ssize_t dma_op_mode_store(struct device *dev, const char *buf, size_t size) { struct omap_mcbsp *mcbsp = dev_get_drvdata(dev); - const char * const *s; - int i = 0; - - for (s = &dma_op_modes[i]; i < ARRAY_SIZE(dma_op_modes); s++, i++) - if (sysfs_streq(buf, *s)) - break; + int i; - if (i == ARRAY_SIZE(dma_op_modes)) - return -EINVAL; + i = sysfs_match_string(dma_op_modes, buf); + if (i < 0) + return i; spin_lock_irq(&mcbsp->lock); if (!mcbsp->free) { -- 2.11.0

2 1

[alsa-devel] [PATCH v2] ASoC: topology: Allow bespoke configuration post widget creation
by Liam Girdwood 09 Jun '17

09 Jun '17

Current topology only allows for widget configuration before the widget is registered. This patch also allows further configuration and usage after registration is complete. Changes v1. Fix build by removing part of an unrelated patch. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/soc-topology.h | 3 +++ sound/soc/soc-topology.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index b8da221615e0..f552c3f56368 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -118,6 +118,9 @@ struct snd_soc_tplg_ops { int (*widget_load)(struct snd_soc_component *, struct snd_soc_dapm_widget *, struct snd_soc_tplg_dapm_widget *); + int (*widget_ready)(struct snd_soc_component *, + struct snd_soc_dapm_widget *, + struct snd_soc_tplg_dapm_widget *); int (*widget_unload)(struct snd_soc_component *, struct snd_soc_dobj *); diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index f4ec236a418e..12e189701924 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -344,6 +344,17 @@ static int soc_tplg_widget_load(struct soc_tplg *tplg, return 0; } +/* optionally pass new dynamic widget to component driver. This is mainly for + * external widgets where we can assign private data/ops */ +static int soc_tplg_widget_ready(struct soc_tplg *tplg, + struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) +{ + if (tplg->comp && tplg->ops && tplg->ops->widget_ready) + return tplg->ops->widget_ready(tplg->comp, w, tplg_w); + + return 0; +} + /* pass DAI configurations to component driver for extra initialization */ static int soc_tplg_dai_load(struct soc_tplg *tplg, struct snd_soc_dai_driver *dai_drv) @@ -1579,8 +1590,16 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, widget->dobj.ops = tplg->ops; widget->dobj.index = tplg->index; list_add(&widget->dobj.list, &tplg->comp->dobj_list); + + ret = soc_tplg_widget_ready(tplg, widget, w); + if (ret < 0) + goto ready_err; + return 0; +ready_err: + snd_soc_tplg_widget_remove(widget); + snd_soc_dapm_free_widget(widget); hdr_err: kfree(template.sname); err: -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: ak4613: Fix out of bounds array access for ak4613_iface
by Axel Lin 09 Jun '17

09 Jun '17

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/ak4613.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index e3121ca..c87ec49 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -347,7 +347,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, if (ak4613_dai_fmt_matching(priv->iface, is_play, fmt, width)) iface = priv->iface; } else { - for (i = ARRAY_SIZE(ak4613_iface); i >= 0; i--) { + for (i = ARRAY_SIZE(ak4613_iface) - 1; i >= 0; i--) { if (!ak4613_dai_fmt_matching(ak4613_iface + i, is_play, fmt, width)) -- 2.9.3

3 2

[alsa-devel] [PATCH RFC 0/7] HDMI audio support for Exynos Odroid boards
by Sylwester Nawrocki 09 Jun '17

09 Jun '17

In this series I gathered patches touching various subsystems to make the overall review easier, finally I'm going to post independently patches for each subsystem and the dts patch(es) will be postponed to subsequent merge window. The main purpose of this series is to add audio codec interface to the Exynos DRM driver, so HDMI audio can be properly supported, also on boards where HDMI is the only connector available for audio. Currently in mainline the ASoC simple-card is used for Odroid XU3, I decided to change it and use a dedicated ASoC machine driver, which allowed to implemement specific clock settings (EPLL and the I2S root clock adjusted to audio sample rates) and to ensure proper number of audio channels gets negotiated in multicodec system configuration. This series is based on v4.11-rc6, has been tested on Odroid XU3. Sylwester Nawrocki (7): clk: samsung: Add enable/disable operation for PLL36XX clocks clk: samsung: Add definitions of some audio related clocks clk: samsung: exynos542x: Add EPLL rate table drm: exynos: Add driver for HDMI audio interface ASoC: Add Odroid sound DT bindings documentation ASoC: samsung: Add Odroid ASoC machine driver ARM: dts: samsung: Switch to dedicated Odroid sound card binding .../devicetree/bindings/sound/samsung,odroid.txt | 57 ++++++ arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 1 + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 59 ++++-- drivers/clk/samsung/clk-exynos5420.c | 31 ++- drivers/clk/samsung/clk-pll.c | 85 ++++---- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_hdmi.c | 220 +++++++++++++++++---- include/dt-bindings/clock/exynos5420.h | 3 + sound/soc/samsung/Kconfig | 8 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/odroid.c | 219 ++++++++++++++++++++ 12 files changed, 599 insertions(+), 88 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt create mode 100644 sound/soc/samsung/odroid.c -- 1.9.1

5 25

[alsa-devel] [PATCH 0/2] ALSA: pcm: trace selection process of hardware parameters
by Takashi Sakamoto 09 Jun '17

09 Jun '17

Hi, This patchset is a revised version of my former RFC. [alsa-devel] [PATCH RFC 00/21] ALSA: pcm: add tracepoints for PCM params operation http://mailman.alsa-project.org/pipermail/alsa-devel/2017-May/120548.html Unlike SNDRV_PCM_IOCTL_HW_REFINE, returned data from invocation of ioctl(2) with SNDRV_PCM_IOCTL_HW_PARAMS includes single value for below parameters: * SNDRV_PCM_HW_PARAM_ACCESS * SNDRV_PCM_HW_PARAM_FORMAT * SNDRV_PCM_HW_PARAM_SUBFORMAT * SNDRV_PCM_HW_PARAM_CHANNELS * SNDRV_PCM_HW_PARAM_RATE * SNDRV_PCM_HW_PARAM_PERIOD_TIME * SNDRV_PCM_HW_PARAM_BUFFER_SIZE * SNDRV_PCM_HW_PARAM_TICK_TIME This is an additional selection process of hardware parameters in service routine of the command. This patchset adds tracepoint events to probe the selection process so that developers can realize final set of parameters by tracing data. Below is a sample. The first three entries are final applications of constraint rules. The rest is newly added by this patchset. $ trace-cmd report ... hw_interval_param: pcmC0D0p 021/023 PERIOD_SIZE 0 1 [1000 1000] 0 1 [1000 1000] hw_interval_param: pcmC0D0p 022/023 BUFFER_BYTES 0 1 [8000 8000] 0 1 [8000 8000] hw_interval_param: pcmC0D0p 023/023 RATE 0 1 [8000 8000] 0 1 [8000 8000] hw_mask_param: pcmC0D0p 000/023 ACCESS 00000000000000000000000000000001 00000000000000000000000000000001 hw_mask_param: pcmC0D0p 000/023 FORMAT 00000000000000000000000000000004 00000000000000000000000000000004 hw_mask_param: pcmC0D0p 000/023 SUBFORMAT 00000000000000000000000000000001 00000000000000000000000000000001 hw_interval_param: pcmC0D0p 000/023 CHANNELS 0 1 [1 1] 0 1 [1 1] hw_interval_param: pcmC0D0p 000/023 RATE 0 1 [8000 8000] 0 1 [8000 8000] hw_interval_param: pcmC0D0p 000/023 PERIOD_TIME 0 1 [125000 125000] 0 1 [125000 125000] hw_interval_param: pcmC0D0p 000/023 BUFFER_SIZE 0 1 [4000 4000] 0 1 [4000 4000] hw_interval_param: pcmC0D0p 000/023 TICK_TIME 0 1 [0 0] 0 1 [0 0] Takashi Sakamoto (3): ALSA: pcm: localize snd_pcm_hw_params_choose() ALSA: pcm: add tracepoints for final selection process of hardware parameters ALSA: pcm: use friendly name for id of PCM substream in trace print sound/core/pcm_lib.c | 40 ---------------------------- sound/core/pcm_local.h | 3 --- sound/core/pcm_native.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ sound/core/pcm_param_trace.h | 8 +++--- 4 files changed, 66 insertions(+), 47 deletions(-) -- 2.11.0

2 4

[alsa-devel] ALSA: firewire-lib: Fix stall of process context on local CPU, with disabled IRQ at packet error
by Takashi Sakamoto 09 Jun '17

09 Jun '17

Hi Clemens and Iwai-san, I found a critical bug on ALSA IEC 61883-1/6 engine at error handling on process context. At packet queueing error or detection of invalid packet, user process can stall on local CPU with IRQ disabled. This bug was introduced at v3.5. I wrote a fix but this can be applied down to v4.9.31, but it's unavailable for the former longterm versions. What can we do for them? ========== 8< ---------- From c8c7541f83913c98bb6f3774127a48c7998caca0 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Date: Fri, 9 Jun 2017 07:40:05 +0900 Subject: [PATCH] ALSA: firewire-lib: Fix stall of process context on local CPU with disabled IRQ at packet error At Linux v3.5, packet processing can be done in process context of ALSA PCM application as well as software IRQ context for OHCI 1394. Below is an example of the callgraph (some calls are omitted). ioctl(2) with e.g. HWSYNC (sound/core/pcm_native.c) ->snd_pcm_common_ioctl1() ->snd_pcm_hwsync() ->snd_pcm_stream_lock_irq (sound/core/pcm_lib.c) ->snd_pcm_update_hw_ptr() ->snd_pcm_udpate_hw_ptr0() ->struct snd_pcm_ops.pointer() (sound/firewire/*) = Each handler on drivers in ALSA firewire stack (sound/firewire/amdtp-stream.c) ->amdtp_stream_pcm_pointer() (drivers/firewire/core-iso.c) ->fw_iso_context_flush_completions() ->struct fw_card_driver.flush_iso_completion() (drivers/firewire/ohci.c) = flush_iso_completions() ->struct fw_iso_context.callback.sc (sound/firewire/amdtp-stream.c) = in_stream_callback() or out_stream_callback() ->... ->snd_pcm_stream_unlock_irq When packet queueing error occurs or detecting invalid packets in 'in_stream_callback()' or 'out_stream_callback()', 'snd_pcm_stop_xrun()' is called on local CPU with disabled IRQ. (sound/firewire/amdtp-stream.c) in_stream_callback() or out_stream_callback() ->amdtp_stream_pcm_abort() ->snd_pcm_stop_xrun() ->snd_pcm_stream_lock_irqsave() ->snd_pcm_stop() ->snd_pcm_stream_unlock_irqrestore() The process is stalled on the CPU. [ 562.630853] INFO: rcu_sched detected stalls on CPUs/tasks: [ 562.630861] 2-...: (1 GPs behind) idle=37d/140000000000000/0 softirq=38323/38323 fqs=7140 [ 562.630862] (detected by 3, t=15002 jiffies, g=21036, c=21035, q=5933) [ 562.630866] Task dump for CPU 2: [ 562.630867] alsa-source-OXF R running task 0 6619 1 0x00000008 [ 562.630870] Call Trace: [ 562.630876] ? vt_console_print+0x79/0x3e0 [ 562.630880] ? msg_print_text+0x9d/0x100 [ 562.630883] ? up+0x32/0x50 [ 562.630885] ? irq_work_queue+0x8d/0xa0 [ 562.630886] ? console_unlock+0x2b6/0x4b0 [ 562.630888] ? vprintk_emit+0x312/0x4a0 [ 562.630892] ? dev_vprintk_emit+0xbf/0x230 [ 562.630895] ? do_sys_poll+0x37a/0x550 [ 562.630897] ? dev_printk_emit+0x4e/0x70 [ 562.630900] ? __dev_printk+0x3c/0x80 [ 562.630903] ? _raw_spin_lock+0x20/0x30 [ 562.630909] ? snd_pcm_stream_lock+0x31/0x50 [snd_pcm] [ 562.630914] ? _snd_pcm_stream_lock_irqsave+0x2e/0x40 [snd_pcm] [ 562.630918] ? snd_pcm_stop_xrun+0x16/0x70 [snd_pcm] [ 562.630922] ? in_stream_callback+0x3e6/0x450 [snd_firewire_lib] [ 562.630925] ? handle_ir_packet_per_buffer+0x8e/0x1a0 [firewire_ohci] [ 562.630928] ? ohci_flush_iso_completions+0xa3/0x130 [firewire_ohci] [ 562.630932] ? fw_iso_context_flush_completions+0x15/0x20 [firewire_core] [ 562.630935] ? amdtp_stream_pcm_pointer+0x2d/0x40 [snd_firewire_lib] [ 562.630938] ? pcm_capture_pointer+0x19/0x20 [snd_oxfw] [ 562.630943] ? snd_pcm_update_hw_ptr0+0x47/0x3d0 [snd_pcm] [ 562.630945] ? poll_select_copy_remaining+0x150/0x150 [ 562.630947] ? poll_select_copy_remaining+0x150/0x150 [ 562.630952] ? snd_pcm_update_hw_ptr+0x10/0x20 [snd_pcm] [ 562.630956] ? snd_pcm_hwsync+0x45/0xb0 [snd_pcm] [ 562.630960] ? snd_pcm_common_ioctl1+0x1ff/0xc90 [snd_pcm] [ 562.630962] ? futex_wake+0x90/0x170 [ 562.630966] ? snd_pcm_capture_ioctl1+0x136/0x260 [snd_pcm] [ 562.630970] ? snd_pcm_capture_ioctl+0x27/0x40 [snd_pcm] [ 562.630972] ? do_vfs_ioctl+0xa3/0x610 [ 562.630974] ? vfs_read+0x11b/0x130 [ 562.630976] ? SyS_ioctl+0x79/0x90 [ 562.630978] ? entry_SYSCALL_64_fastpath+0x1e/0xad This commit attempts to fix the above bug by removing the calls of 'amdtp_stream_pcm_abort()' from packet handler. When encountering the error state, the packet handler is already programmed not to process packets anymore. This commit expects any process context or software IRQ contexts to detect PCM XRUN by calls of snd_pcm_hw_ptr() or checking status data of PCM substream. Fixes: e9148dddc3c7("ALSA: firewire-lib: flush completed packets when reading PCM position") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 4316d9db404d..65e215764c21 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -682,7 +682,6 @@ static void out_stream_callback(struct fw_iso_context *context, u32 tstamp, cycle = increment_cycle_count(cycle, 1); if (s->handle_packet(s, 0, cycle, i) < 0) { s->packet_index = -1; - amdtp_stream_pcm_abort(s); return; } } @@ -734,7 +733,6 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp, /* Queueing error or detecting invalid payload. */ if (i < packets) { s->packet_index = -1; - amdtp_stream_pcm_abort(s); return; } -- 2.11.0 Regards Takashi Sakamoto

3 6

[alsa-devel] [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In
by Danny Milosavljevic 09 Jun '17

09 Jun '17

This patchset adds some mixer controls to sun4i-codec. It also adds a mux for the capture source and the PGA for the MIC2 preamp. Where possible, it uses SOC_DAPM_DOUBLE in order to cut down on the number of distinct controls in alsamixer. v11 changes compared to v10 are: - Split up patchset. - Fixed typo in Differential Line Capture Switch. - Renamed "Non-Differential" value to "Stereo". - Removed duplicate PA Volume mixer control. v10 changes compared to v9 are: - Use SOC_DAPM_DOUBLE where possible and it makes sense in order to cut down on the number of controls. v9 changes compared to v8 are: - added Line Differential Capture Switch. - split Capture Source into Left Capture Select, Right Capture Select. - added Line Capture Volume. - rename "sun4i_codec_widgets" to "sun4i_codec_controls" for consistency with the struct field it's used in. - rename "Line-In" to "Line". - rename "Power Amplifier Playback Volume" to "Headphone Playback Volume". v8 changes compared to v7 are: - fixed the routes for line and mic capturing. v7 changes compared to v6 are: - preparation for different A20, A10 controls is now in an extra patch. - all register definitions are now at the top. - sun7i-specific things (A20-specific things) are now less grouped-together. - rename "Power Amplifier Volume" to "Power Amplifier Playback Volume". v6 changes compared to v5 are: - Mic preamplifier special cases for A20 and A10 now are now not icky: There are two different _widget arrays and the probe() function now selects the right one to pass to snd_soc_register_codec() unmodified. - sun7i-specific things (A20-specific things) are now grouped together. v5 changes compared to v4 are: - Mic preamplifier controls have more common names now. - Mic preamplifier scale has a 0 dB entry as well now, as documented in the A20 user manual. - Mic preamplifier has special cases for A20 and A10 now. - Gain controls have "Gain" in the name now. v4 changes compared to v3 are: - names of the input are not uppercase anymore. - bit index constants are now named as in the A20 user manual v1.4. - added Mic1-In, Mac2-In. - added Mic1 and Mic2 Pre-Amplifiers. v3 changes compared to v2 are: - added DAPM routes. v2 changes compared to v1 are: - moved Line-In and FM-In playback switches to their respective sun4i_codec_*_mixer_controls. v1 changes: - added linein, fmin output volumes and switches. Danny Milosavljevic (12): sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left. sun4i-codec: Add Differential Line Capture Switch and its routes sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume. sun4i-codec: Add Mic1 Capture Volume, Mic2 Capture Volume. sun4i-codec: Move struct sun4i_codec_quirks further up. sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks. sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch. sun4i-codec: Add Left Capture Select, Right Capture Select. sun4i-codec: Add MIC2 Pre-Amplifier. sun4i-codec: Add routes for playback switches, Mic2, Capture Select. sound/soc/sunxi/sun4i-codec.c | 283 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 259 insertions(+), 24 deletions(-)

2 18

[alsa-devel] [PATCH] ALSA: vx: vx_pcm: constify vx_pcm_playback_ops and vx_pcm_capture_ops.
by Arvind Yadav 09 Jun '17

09 Jun '17

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 <arvind.yadav.cs(a)gmail.com> --- sound/drivers/vx/vx_pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index ea7b377..d318a33 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c @@ -873,7 +873,7 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs) /* * operators for PCM playback */ -static struct snd_pcm_ops vx_pcm_playback_ops = { +static const struct snd_pcm_ops vx_pcm_playback_ops = { .open = vx_pcm_playback_open, .close = vx_pcm_playback_close, .ioctl = snd_pcm_lib_ioctl, @@ -1095,7 +1095,7 @@ static snd_pcm_uframes_t vx_pcm_capture_pointer(struct snd_pcm_substream *subs) /* * operators for PCM capture */ -static struct snd_pcm_ops vx_pcm_capture_ops = { +static const struct snd_pcm_ops vx_pcm_capture_ops = { .open = vx_pcm_capture_open, .close = vx_pcm_capture_close, .ioctl = snd_pcm_lib_ioctl, -- 1.9.1

2 3

[alsa-devel] [PATCH] ALSA : pcsp: pcsp_lib: constify snd_pcsp_playback_ops
by Arvind Yadav 09 Jun '17

09 Jun '17

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 <arvind.yadav.cs(a)gmail.com> --- sound/drivers/pcsp/pcsp_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index aca2d7d..44b3632 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c @@ -323,7 +323,7 @@ static int snd_pcsp_playback_open(struct snd_pcm_substream *substream) return 0; } -static struct snd_pcm_ops snd_pcsp_playback_ops = { +static const struct snd_pcm_ops snd_pcsp_playback_ops = { .open = snd_pcsp_playback_open, .close = snd_pcsp_playback_close, .ioctl = snd_pcm_lib_ioctl, -- 1.9.1

2 1