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

[alsa-devel] [PATCH] ALSA: asihpi: fix a potential double-fetch bug when copying puhm
by Meng Xu 19 Sep '17

19 Sep '17

The hm->h.size is intended to hold the actual size of the hm struct that is copied from userspace and should always be <= sizeof(*hm). However, after copy_from_user(hm, puhm, hm->h.size), since userspace process has full control over the memory region pointed by puhm, it is possible that the value of hm->h.size is different from what is fetched-in previously (get_user(hm->h.size, (u16 __user *)puhm)). In other words, hm->h.size is overriden and the relation between hm->h.size and the hm struct is broken. This patch proposes to use a seperate variable, msg_size, to hold the value of the first fetch and override hm->h.size to msg_size after the second fetch to maintain the relation. Signed-off-by: Meng Xu <mengxu.gatech(a)gmail.com> --- sound/pci/asihpi/hpioctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index 7e3aa50..5badd08 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c @@ -103,6 +103,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) void __user *puhr; union hpi_message_buffer_v1 *hm; union hpi_response_buffer_v1 *hr; + u16 msg_size; u16 res_max_size; u32 uncopied_bytes; int err = 0; @@ -127,22 +128,25 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } /* Now read the message size and data from user space. */ - if (get_user(hm->h.size, (u16 __user *)puhm)) { + if (get_user(msg_size, (u16 __user *)puhm)) { err = -EFAULT; goto out; } - if (hm->h.size > sizeof(*hm)) - hm->h.size = sizeof(*hm); + if (msg_size > sizeof(*hm)) + msg_size = sizeof(*hm); /* printk(KERN_INFO "message size %d\n", hm->h.wSize); */ - uncopied_bytes = copy_from_user(hm, puhm, hm->h.size); + uncopied_bytes = copy_from_user(hm, puhm, msg_size); if (uncopied_bytes) { HPI_DEBUG_LOG(ERROR, "uncopied bytes %d\n", uncopied_bytes); err = -EFAULT; goto out; } + /* Override h.size in case it is changed between two userspace fetches */ + hm->h.size = msg_size; + if (get_user(res_max_size, (u16 __user *)puhr)) { err = -EFAULT; goto out; -- 2.7.4

3 3

[alsa-devel] [asoc:for-next 9/9] sound/soc/codecs/wm9712.c:737:1: error: invalid storage class for function '__inittest'
by kbuild test robot 19 Sep '17

19 Sep '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 8c860a21cc365e822e70f970684179a50d22a77b commit: 8c860a21cc365e822e70f970684179a50d22a77b [9/9] Merge remote-tracking branches 'asoc/topic/wm97xx' and 'asoc/topic/zte' into asoc-next config: tile-allmodconfig (attached as .config) compiler: tilegx-linux-gcc (GCC) 4.6.2 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 8c860a21cc365e822e70f970684179a50d22a77b # save the attached .config to linux build tree make.cross ARCH=tile All errors (new ones prefixed by >>): sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe': sound/soc/codecs/wm9712.c:675:12: error: invalid storage class for function 'wm9712_soc_remove' sound/soc/codecs/wm9712.c:675:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] sound/soc/codecs/wm9712.c:690:2: error: initializer element is not constant sound/soc/codecs/wm9712.c:690:2: error: (near initialization for 'soc_codec_dev_wm9712.remove') sound/soc/codecs/wm9712.c:705:12: error: invalid storage class for function 'wm9712_probe' sound/soc/codecs/wm9712.c:722:12: error: invalid storage class for function 'wm9712_remove' sound/soc/codecs/wm9712.c:733:2: error: initializer element is not constant sound/soc/codecs/wm9712.c:733:2: error: (near initialization for 'wm9712_codec_driver.probe') sound/soc/codecs/wm9712.c:734:2: error: initializer element is not constant sound/soc/codecs/wm9712.c:734:2: error: (near initialization for 'wm9712_codec_driver.remove') sound/soc/codecs/wm9712.c:737:1: error: invalid storage class for function 'wm9712_codec_driver_init' >> sound/soc/codecs/wm9712.c:737:1: error: invalid storage class for function '__inittest' sound/soc/codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] sound/soc/codecs/wm9712.c:737:1: error: invalid storage class for function 'wm9712_codec_driver_exit' sound/soc/codecs/wm9712.c:737:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] >> sound/soc/codecs/wm9712.c:737:1: error: invalid storage class for function '__exittest' sound/soc/codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] sound/soc/codecs/wm9712.c:739:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] sound/soc/codecs/wm9712.c:741:1: error: expected declaration or statement at end of input sound/soc/codecs/wm9712.c: At top level: sound/soc/codecs/wm9712.c:637:12: warning: 'wm9712_soc_probe' defined but not used [-Wunused-function] vim +/__inittest +737 sound/soc/codecs/wm9712.c 10c5cf304 Richard Purdie 2006-10-06 687 f802d6c02 Julia Lawall 2016-08-31 688 static const struct snd_soc_codec_driver soc_codec_dev_wm9712 = { 10c5cf304 Richard Purdie 2006-10-06 689 .probe = wm9712_soc_probe, 10c5cf304 Richard Purdie 2006-10-06 @690 .remove = wm9712_soc_remove, 10c5cf304 Richard Purdie 2006-10-06 691 .resume = wm9712_soc_resume, f0fba2ad1 Liam Girdwood 2010-03-17 692 .set_bias_level = wm9712_set_bias_level, ab492b86b Lars-Peter Clausen 2014-11-23 693 .suspend_bias_off = true, 9a812c6b7 Lars-Peter Clausen 2014-10-30 694 3123e54b3 Kuninori Morimoto 2016-08-08 695 .component_driver = { 9a812c6b7 Lars-Peter Clausen 2014-10-30 696 .controls = wm9712_snd_ac97_controls, 9a812c6b7 Lars-Peter Clausen 2014-10-30 697 .num_controls = ARRAY_SIZE(wm9712_snd_ac97_controls), 983347785 Lu Guanqun 2011-03-30 698 .dapm_widgets = wm9712_dapm_widgets, 983347785 Lu Guanqun 2011-03-30 699 .num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets), 983347785 Lu Guanqun 2011-03-30 700 .dapm_routes = wm9712_audio_map, 983347785 Lu Guanqun 2011-03-30 701 .num_dapm_routes = ARRAY_SIZE(wm9712_audio_map), 3123e54b3 Kuninori Morimoto 2016-08-08 702 }, 10c5cf304 Richard Purdie 2006-10-06 703 }; f0fba2ad1 Liam Girdwood 2010-03-17 704 7a79e94e9 Bill Pemberton 2012-12-07 705 static int wm9712_probe(struct platform_device *pdev) f0fba2ad1 Liam Girdwood 2010-03-17 706 { cf1f2ebe8 Lars-Peter Clausen 2014-11-03 707 struct wm9712_priv *wm9712; cf1f2ebe8 Lars-Peter Clausen 2014-11-03 708 cf1f2ebe8 Lars-Peter Clausen 2014-11-03 709 wm9712 = devm_kzalloc(&pdev->dev, sizeof(*wm9712), GFP_KERNEL); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 710 if (wm9712 == NULL) cf1f2ebe8 Lars-Peter Clausen 2014-11-03 711 return -ENOMEM; cf1f2ebe8 Lars-Peter Clausen 2014-11-03 712 cf1f2ebe8 Lars-Peter Clausen 2014-11-03 713 mutex_init(&wm9712->lock); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 714 2ed1a8e0c Robert Jarzmik 2017-09-13 715 wm9712->mfd_pdata = dev_get_platdata(&pdev->dev); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 716 platform_set_drvdata(pdev, wm9712); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 717 f0fba2ad1 Liam Girdwood 2010-03-17 718 return snd_soc_register_codec(&pdev->dev, f0fba2ad1 Liam Girdwood 2010-03-17 719 &soc_codec_dev_wm9712, wm9712_dai, ARRAY_SIZE(wm9712_dai)); f0fba2ad1 Liam Girdwood 2010-03-17 720 } f0fba2ad1 Liam Girdwood 2010-03-17 721 7a79e94e9 Bill Pemberton 2012-12-07 722 static int wm9712_remove(struct platform_device *pdev) f0fba2ad1 Liam Girdwood 2010-03-17 723 { f0fba2ad1 Liam Girdwood 2010-03-17 724 snd_soc_unregister_codec(&pdev->dev); f0fba2ad1 Liam Girdwood 2010-03-17 725 return 0; f0fba2ad1 Liam Girdwood 2010-03-17 726 } f0fba2ad1 Liam Girdwood 2010-03-17 727 f0fba2ad1 Liam Girdwood 2010-03-17 728 static struct platform_driver wm9712_codec_driver = { f0fba2ad1 Liam Girdwood 2010-03-17 729 .driver = { f0fba2ad1 Liam Girdwood 2010-03-17 730 .name = "wm9712-codec", f0fba2ad1 Liam Girdwood 2010-03-17 731 }, f0fba2ad1 Liam Girdwood 2010-03-17 732 f0fba2ad1 Liam Girdwood 2010-03-17 @733 .probe = wm9712_probe, 7a79e94e9 Bill Pemberton 2012-12-07 734 .remove = wm9712_remove, f0fba2ad1 Liam Girdwood 2010-03-17 735 }; f0fba2ad1 Liam Girdwood 2010-03-17 736 5bbcc3c0d Mark Brown 2011-11-23 @737 module_platform_driver(wm9712_codec_driver); 10c5cf304 Richard Purdie 2006-10-06 738 :::::: The code at line 737 was first introduced by commit :::::: 5bbcc3c0d0f063318ec83146d1958acf7154c66f ASoC: Convert CODEC drivers to module_platform_driver :::::: TO: Mark Brown <broonie(a)opensource.wolfsonmicro.com> :::::: CC: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:for-next 9/9] sound/soc/codecs/wm9712.c:675:12: error: invalid storage class for function 'wm9712_soc_remove'
by kbuild test robot 19 Sep '17

19 Sep '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 8c860a21cc365e822e70f970684179a50d22a77b commit: 8c860a21cc365e822e70f970684179a50d22a77b [9/9] Merge remote-tracking branches 'asoc/topic/wm97xx' and 'asoc/topic/zte' into asoc-next config: xtensa-allmodconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 4.9.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 8c860a21cc365e822e70f970684179a50d22a77b # save the attached .config to linux build tree make.cross ARCH=xtensa All error/warnings (new ones prefixed by >>): sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe': >> sound/soc/codecs/wm9712.c:675:12: error: invalid storage class for function 'wm9712_soc_remove' static int wm9712_soc_remove(struct snd_soc_codec *codec) ^ >> sound/soc/codecs/wm9712.c:675:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static int wm9712_soc_remove(struct snd_soc_codec *codec) ^ >> sound/soc/codecs/wm9712.c:690:2: error: initializer element is not constant .remove = wm9712_soc_remove, ^ sound/soc/codecs/wm9712.c:690:2: error: (near initialization for 'soc_codec_dev_wm9712.remove') >> sound/soc/codecs/wm9712.c:705:12: error: invalid storage class for function 'wm9712_probe' static int wm9712_probe(struct platform_device *pdev) ^ >> sound/soc/codecs/wm9712.c:722:12: error: invalid storage class for function 'wm9712_remove' static int wm9712_remove(struct platform_device *pdev) ^ sound/soc/codecs/wm9712.c:733:2: error: initializer element is not constant .probe = wm9712_probe, ^ sound/soc/codecs/wm9712.c:733:2: error: (near initialization for 'wm9712_codec_driver.probe') sound/soc/codecs/wm9712.c:734:2: error: initializer element is not constant .remove = wm9712_remove, ^ sound/soc/codecs/wm9712.c:734:2: error: (near initialization for 'wm9712_codec_driver.remove') In file included from sound/soc/codecs/wm9712.c:18:0: >> sound/soc/codecs/wm9712.c:737:24: error: invalid storage class for function 'wm9712_codec_driver_init' module_platform_driver(wm9712_codec_driver); ^ include/linux/device.h:1502:19: note: in definition of macro 'module_driver' static int __init __driver##_init(void) \ ^ >> sound/soc/codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ In file included from sound/soc/codecs/wm9712.c:16:0: >> include/linux/module.h:129:42: error: invalid storage class for function '__inittest' static inline initcall_t __maybe_unused __inittest(void) \ ^ include/linux/device.h:1506:1: note: in expansion of macro 'module_init' module_init(__driver##_init); \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ >> sound/soc/codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ >> sound/soc/codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] In file included from sound/soc/codecs/wm9712.c:18:0: >> sound/soc/codecs/wm9712.c:737:24: error: invalid storage class for function 'wm9712_codec_driver_exit' module_platform_driver(wm9712_codec_driver); ^ include/linux/device.h:1507:20: note: in definition of macro 'module_driver' static void __exit __driver##_exit(void) \ ^ >> sound/soc/codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ >> include/linux/device.h:1507:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static void __exit __driver##_exit(void) \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ >> sound/soc/codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ In file included from sound/soc/codecs/wm9712.c:16:0: >> include/linux/module.h:135:42: error: invalid storage class for function '__exittest' static inline exitcall_t __maybe_unused __exittest(void) \ ^ include/linux/device.h:1511:1: note: in expansion of macro 'module_exit' module_exit(__driver##_exit); ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ >> sound/soc/codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ >> sound/soc/codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] In file included from include/linux/module.h:18:0, from sound/soc/codecs/wm9712.c:16: include/linux/moduleparam.h:21:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static const char __UNIQUE_ID(name)[] \ ^ include/linux/module.h:160:32: note: in expansion of macro '__MODULE_INFO' #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info) ^ include/linux/module.h:207:42: note: in expansion of macro 'MODULE_INFO' #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) ^ >> sound/soc/codecs/wm9712.c:739:1: note: in expansion of macro 'MODULE_DESCRIPTION' MODULE_DESCRIPTION("ASoC WM9711/WM9712 driver"); ^ >> sound/soc/codecs/wm9712.c:741:1: error: expected declaration or statement at end of input MODULE_LICENSE("GPL"); ^ sound/soc/codecs/wm9712.c: At top level: sound/soc/codecs/wm9712.c:637:12: warning: 'wm9712_soc_probe' defined but not used [-Wunused-function] static int wm9712_soc_probe(struct snd_soc_codec *codec) ^ -- sound/soc//codecs/wm9712.c: In function 'wm9712_soc_probe': sound/soc//codecs/wm9712.c:675:12: error: invalid storage class for function 'wm9712_soc_remove' static int wm9712_soc_remove(struct snd_soc_codec *codec) ^ sound/soc//codecs/wm9712.c:675:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static int wm9712_soc_remove(struct snd_soc_codec *codec) ^ sound/soc//codecs/wm9712.c:690:2: error: initializer element is not constant .remove = wm9712_soc_remove, ^ sound/soc//codecs/wm9712.c:690:2: error: (near initialization for 'soc_codec_dev_wm9712.remove') sound/soc//codecs/wm9712.c:705:12: error: invalid storage class for function 'wm9712_probe' static int wm9712_probe(struct platform_device *pdev) ^ sound/soc//codecs/wm9712.c:722:12: error: invalid storage class for function 'wm9712_remove' static int wm9712_remove(struct platform_device *pdev) ^ sound/soc//codecs/wm9712.c:733:2: error: initializer element is not constant .probe = wm9712_probe, ^ sound/soc//codecs/wm9712.c:733:2: error: (near initialization for 'wm9712_codec_driver.probe') sound/soc//codecs/wm9712.c:734:2: error: initializer element is not constant .remove = wm9712_remove, ^ sound/soc//codecs/wm9712.c:734:2: error: (near initialization for 'wm9712_codec_driver.remove') In file included from sound/soc//codecs/wm9712.c:18:0: sound/soc//codecs/wm9712.c:737:24: error: invalid storage class for function 'wm9712_codec_driver_init' module_platform_driver(wm9712_codec_driver); ^ include/linux/device.h:1502:19: note: in definition of macro 'module_driver' static int __init __driver##_init(void) \ ^ sound/soc//codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ In file included from sound/soc//codecs/wm9712.c:16:0: >> include/linux/module.h:129:42: error: invalid storage class for function '__inittest' static inline initcall_t __maybe_unused __inittest(void) \ ^ include/linux/device.h:1506:1: note: in expansion of macro 'module_init' module_init(__driver##_init); \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ sound/soc//codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ sound/soc//codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] In file included from sound/soc//codecs/wm9712.c:18:0: sound/soc//codecs/wm9712.c:737:24: error: invalid storage class for function 'wm9712_codec_driver_exit' module_platform_driver(wm9712_codec_driver); ^ include/linux/device.h:1507:20: note: in definition of macro 'module_driver' static void __exit __driver##_exit(void) \ ^ sound/soc//codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ >> include/linux/device.h:1507:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static void __exit __driver##_exit(void) \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ sound/soc//codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ In file included from sound/soc//codecs/wm9712.c:16:0: >> include/linux/module.h:135:42: error: invalid storage class for function '__exittest' static inline exitcall_t __maybe_unused __exittest(void) \ ^ include/linux/device.h:1511:1: note: in expansion of macro 'module_exit' module_exit(__driver##_exit); ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^ sound/soc//codecs/wm9712.c:737:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(wm9712_codec_driver); ^ sound/soc//codecs/wm9712.c:737:1: warning: 'alias' attribute ignored [-Wattributes] In file included from include/linux/module.h:18:0, from sound/soc//codecs/wm9712.c:16: include/linux/moduleparam.h:21:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] static const char __UNIQUE_ID(name)[] \ ^ include/linux/module.h:160:32: note: in expansion of macro '__MODULE_INFO' #define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info) ^ include/linux/module.h:207:42: note: in expansion of macro 'MODULE_INFO' #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) ^ sound/soc//codecs/wm9712.c:739:1: note: in expansion of macro 'MODULE_DESCRIPTION' MODULE_DESCRIPTION("ASoC WM9711/WM9712 driver"); ^ sound/soc//codecs/wm9712.c:741:1: error: expected declaration or statement at end of input MODULE_LICENSE("GPL"); ^ sound/soc//codecs/wm9712.c: At top level: sound/soc//codecs/wm9712.c:637:12: warning: 'wm9712_soc_probe' defined but not used [-Wunused-function] static int wm9712_soc_probe(struct snd_soc_codec *codec) ^ vim +/wm9712_soc_remove +675 sound/soc/codecs/wm9712.c 10c5cf304 Richard Purdie 2006-10-06 674 f0fba2ad1 Liam Girdwood 2010-03-17 @675 static int wm9712_soc_remove(struct snd_soc_codec *codec) 10c5cf304 Richard Purdie 2006-10-06 676 { 2ed1a8e0c Robert Jarzmik 2017-09-13 677 #ifdef CONFIG_SND_SOC_AC97_BUS 358a8bb56 Lars-Peter Clausen 2014-11-10 678 struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec); 358a8bb56 Lars-Peter Clausen 2014-11-10 679 2ed1a8e0c Robert Jarzmik 2017-09-13 680 if (!wm9712->mfd_pdata) { b4f4f2eba Lars-Peter Clausen 2016-09-30 681 snd_soc_codec_exit_regmap(codec); 358a8bb56 Lars-Peter Clausen 2014-11-10 682 snd_soc_free_ac97_codec(wm9712->ac97); 2ed1a8e0c Robert Jarzmik 2017-09-13 683 } 2ed1a8e0c Robert Jarzmik 2017-09-13 684 #endif 10c5cf304 Richard Purdie 2006-10-06 685 return 0; 10c5cf304 Richard Purdie 2006-10-06 686 } 10c5cf304 Richard Purdie 2006-10-06 687 f802d6c02 Julia Lawall 2016-08-31 688 static const struct snd_soc_codec_driver soc_codec_dev_wm9712 = { 10c5cf304 Richard Purdie 2006-10-06 689 .probe = wm9712_soc_probe, 10c5cf304 Richard Purdie 2006-10-06 @690 .remove = wm9712_soc_remove, 10c5cf304 Richard Purdie 2006-10-06 691 .resume = wm9712_soc_resume, f0fba2ad1 Liam Girdwood 2010-03-17 692 .set_bias_level = wm9712_set_bias_level, ab492b86b Lars-Peter Clausen 2014-11-23 693 .suspend_bias_off = true, 9a812c6b7 Lars-Peter Clausen 2014-10-30 694 3123e54b3 Kuninori Morimoto 2016-08-08 695 .component_driver = { 9a812c6b7 Lars-Peter Clausen 2014-10-30 696 .controls = wm9712_snd_ac97_controls, 9a812c6b7 Lars-Peter Clausen 2014-10-30 697 .num_controls = ARRAY_SIZE(wm9712_snd_ac97_controls), 983347785 Lu Guanqun 2011-03-30 698 .dapm_widgets = wm9712_dapm_widgets, 983347785 Lu Guanqun 2011-03-30 699 .num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets), 983347785 Lu Guanqun 2011-03-30 700 .dapm_routes = wm9712_audio_map, 983347785 Lu Guanqun 2011-03-30 701 .num_dapm_routes = ARRAY_SIZE(wm9712_audio_map), 3123e54b3 Kuninori Morimoto 2016-08-08 702 }, 10c5cf304 Richard Purdie 2006-10-06 703 }; f0fba2ad1 Liam Girdwood 2010-03-17 704 7a79e94e9 Bill Pemberton 2012-12-07 @705 static int wm9712_probe(struct platform_device *pdev) f0fba2ad1 Liam Girdwood 2010-03-17 706 { cf1f2ebe8 Lars-Peter Clausen 2014-11-03 707 struct wm9712_priv *wm9712; cf1f2ebe8 Lars-Peter Clausen 2014-11-03 708 cf1f2ebe8 Lars-Peter Clausen 2014-11-03 709 wm9712 = devm_kzalloc(&pdev->dev, sizeof(*wm9712), GFP_KERNEL); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 710 if (wm9712 == NULL) cf1f2ebe8 Lars-Peter Clausen 2014-11-03 711 return -ENOMEM; cf1f2ebe8 Lars-Peter Clausen 2014-11-03 712 cf1f2ebe8 Lars-Peter Clausen 2014-11-03 713 mutex_init(&wm9712->lock); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 714 2ed1a8e0c Robert Jarzmik 2017-09-13 715 wm9712->mfd_pdata = dev_get_platdata(&pdev->dev); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 716 platform_set_drvdata(pdev, wm9712); cf1f2ebe8 Lars-Peter Clausen 2014-11-03 717 f0fba2ad1 Liam Girdwood 2010-03-17 718 return snd_soc_register_codec(&pdev->dev, f0fba2ad1 Liam Girdwood 2010-03-17 719 &soc_codec_dev_wm9712, wm9712_dai, ARRAY_SIZE(wm9712_dai)); f0fba2ad1 Liam Girdwood 2010-03-17 720 } f0fba2ad1 Liam Girdwood 2010-03-17 721 7a79e94e9 Bill Pemberton 2012-12-07 @722 static int wm9712_remove(struct platform_device *pdev) f0fba2ad1 Liam Girdwood 2010-03-17 723 { f0fba2ad1 Liam Girdwood 2010-03-17 724 snd_soc_unregister_codec(&pdev->dev); f0fba2ad1 Liam Girdwood 2010-03-17 725 return 0; f0fba2ad1 Liam Girdwood 2010-03-17 726 } f0fba2ad1 Liam Girdwood 2010-03-17 727 f0fba2ad1 Liam Girdwood 2010-03-17 728 static struct platform_driver wm9712_codec_driver = { f0fba2ad1 Liam Girdwood 2010-03-17 729 .driver = { f0fba2ad1 Liam Girdwood 2010-03-17 730 .name = "wm9712-codec", f0fba2ad1 Liam Girdwood 2010-03-17 731 }, f0fba2ad1 Liam Girdwood 2010-03-17 732 f0fba2ad1 Liam Girdwood 2010-03-17 @733 .probe = wm9712_probe, 7a79e94e9 Bill Pemberton 2012-12-07 @734 .remove = wm9712_remove, f0fba2ad1 Liam Girdwood 2010-03-17 735 }; f0fba2ad1 Liam Girdwood 2010-03-17 736 5bbcc3c0d Mark Brown 2011-11-23 @737 module_platform_driver(wm9712_codec_driver); 10c5cf304 Richard Purdie 2006-10-06 738 10c5cf304 Richard Purdie 2006-10-06 @739 MODULE_DESCRIPTION("ASoC WM9711/WM9712 driver"); 10c5cf304 Richard Purdie 2006-10-06 740 MODULE_AUTHOR("Liam Girdwood"); 10c5cf304 Richard Purdie 2006-10-06 @741 MODULE_LICENSE("GPL"); :::::: The code at line 675 was first introduced by commit :::::: f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ASoC: multi-component - ASoC Multi-Component Support :::::: TO: Liam Girdwood <lrg(a)slimlogic.co.uk> :::::: CC: Liam Girdwood <lrg(a)slimlogic.co.uk> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: Intel: Atom: Remove unneeded linux/miscdevice.h include
by Corentin Labbe 19 Sep '17

19 Sep '17

No file in sound/soc/intel/ use any miscdevice. This patch remove this uncessary include. Signed-off-by: Corentin Labbe <clabbe.montjoie(a)gmail.com> --- sound/soc/intel/atom/sst/sst_acpi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index f4d92bb..a971a58 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -23,7 +23,6 @@ #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/io.h> -#include <linux/miscdevice.h> #include <linux/platform_device.h> #include <linux/firmware.h> #include <linux/pm_runtime.h> -- 2.10.2

2 1

[alsa-devel] [PATCH v2 00/12] AC97 device/driver model revamp
by Robert Jarzmik 19 Sep '17

19 Sep '17

Hi Lars, Mark, Charles, Lee, This serie has been stalled for almost one year, as I wasn't feeling that well lately. I'm quite better now, so let's get back to it. As it's been so long since the last review, I basically withdrew all my former objections and took into account all remarks regardless of my own judgement. This is especially the case with Lars's review on the bus code, where I tried to address all his comments. For this next round, let's sum up what happened : - I rebased against latest Linus's tree => as Lars had made ports to regmap of several impacted wm97xx drivers, all the better for me. - ALSA: ac97: add an ac97 bus => this addresses Lars's comments => history : https://patchwork.kernel.org/patch/9398229/ => there is one remark which was left out, the drop of the table ac97_controller->codecs. The reason is that there are traversals required in the bus scan and controller removal, and the code is way simpler with a table, and the data structure very compact. - Input: wm97xx: split out touchscreen registering => Charles's comment taken into account => history: http://https://patchwork.kernel.org/patch/9398223/ Have a happy review. -- Robert Robert Jarzmik (11): ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support Takashi Iwai (1): ASoC: Fix use-after-free at card unregistration drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 282 +++++++++++++++++ include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 85 ++++++ include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 526 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/Kconfig | 4 + sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 59 ++-- sound/soc/codecs/wm9712.c | 37 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 43 ++- sound/soc/soc-core.c | 5 +- 29 files changed, 1603 insertions(+), 178 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4

4 23

[alsa-devel] [PATCH 0/9] AC97 device/driver model revamp
by Robert Jarzmik 19 Sep '17

19 Sep '17

It all started in the pxa device-tree submission here : https://lkml.org/lkml/2016/2/25/965 Last submission was a RFC in here: http://www.gossamer-threads.com/lists/linux/kernel/2446863 It will be maintained in : git fetch https://github.com/rjarzmik/linux.git work/ac97 The driving ideas are still the same, and I put them in [1] for memory. This is the first post RFC submission. In order to make a full demonstration of the framework, wm97xx was converted to an MFD, see [2] for the "why". As this serie is a complete wm9713 change towards the new AC97 bus, here is the patch organization : - 1/9, 2/9, 3/9 and 5/9: the new AC97 bus, for Mark and Takashi to review - 4/9: wm9713 conversion, this one has ugly #ifdefs, should be reviewed more carefully - 6/9: prerequisite for final 9/9, for Marek and Sebastian to approve => this one is independent and can flow through Sebastian's tree in this next-cycle if accepted - 7/9: prerequisite for final 9/9, for Mark/Dmitry => this one is also independent and can flow in this cycle if accepted - 8/9: prerequisite for final 9/9, for Lee to review => this one has a dependency on 2/9, so it probably can't fit in this next-cycle - 9/9: this last one depends on all the patches before, so it can't fit in this next-cycle As a sum-up, I'd like to push for review for this -next cycle at least the patches 1, 2, 3, 5, 6 and 9. Happy review. Robert Jarzmik (9): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: wm9713: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support power_supply: wm97xx_battery: use power_supply_get_drvdata Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 247 +++++++++++----- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 282 ++++++++++++++++++ drivers/power/supply/wm97xx_battery.c | 25 +- include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 115 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 85 ++++++ include/sound/ac97/regs.h | 262 ++++++++++++++++ include/sound/ac97_codec.h | 239 +-------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 510 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 39 ++- sound/soc/Kconfig | 4 + sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/wm9713.c | 37 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 22 +- 28 files changed, 1738 insertions(+), 382 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4 [1] RFC PATCH reminder: Amongst the driving ideas behind this RFC : - use device/driver model for AC'97 device/driver binding is based on vendor_id{1,2} - use auto-probe of the AC'97 bus to enumerate codecs and create devices - be compatible with previous platform_data model for codecs => this enables a smooth transition, where a codec (here wm9713) can be used either through platform_device or automatic discovery - struct snd_ac97 is not used This structure is really heavy, and doesn't represent an AC97 device, but rather an AC'97 codec internals IIUC. I think it's right place would be in include/sound/ac97/codec.h. This is also a problem for regmap adherence, hence the include/sound/ac97/compat.h. - a new AC'97 bus Kconfig is created This was done for a smooth transition ... let's see if it's a good idea. - split the AC'97 into : - the codec - the digital controller - the bus Amongst the things that are not all touched yet : - ac97_codec.c The generic AC'97 codec in sound/pci/ac97/ac97_codec.c has really a lot features, which are not at all PCI related. They could be transfered to sound/ac97, without the pci specific field. => this deserves a deep ahead thinking, which I'll do if the current approach is accepted by the communauty. The most important patch is 2/7 "ALSA: ac97: add an ac97 bus". This is the main evaluation point for the serie, the others are here so that I can test it all. Well, this is a long term effort, which might need a complete rewrite according to the comments it'll get. Let's expose it for comments and see how I can progress with it. [2] As a corollary, wm97xx is changed into a MFD device, which at least spawns: - the touchscreen device - the ac97 codec - the problem to solve was stated in http://www.gossamer-threads.com/lists/linux/kernel/2510113#2510113

9 38

[alsa-devel] Applied "ASoC: wm9713: add ac97 new bus support" to the asoc tree
by Mark Brown 19 Sep '17

19 Sep '17

The patch ASoC: wm9713: add ac97 new bus support has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9bd400cadae05a26c3a22dd8393081cb96d0e26a Mon Sep 17 00:00:00 2001 From: Robert Jarzmik <robert.jarzmik(a)free.fr> Date: Wed, 13 Sep 2017 21:37:19 +0200 Subject: [PATCH] ASoC: wm9713: add ac97 new bus support Add support for the new ac97 bus model, where devices are automatically discovered on AC-Links. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> Acked-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Kconfig | 3 ++- sound/soc/codecs/wm9713.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c367d11079bc..807901cac1b3 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -216,7 +216,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM9090 if I2C select SND_SOC_WM9705 if SND_SOC_AC97_BUS select SND_SOC_WM9712 if SND_SOC_AC97_BUS - select SND_SOC_WM9713 if SND_SOC_AC97_BUS + select SND_SOC_WM9713 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW) help Normally ASoC codec drivers are only built if a machine driver which uses them is also built since they are only usable with a machine @@ -1136,6 +1136,7 @@ config SND_SOC_WM9712 config SND_SOC_WM9713 tristate select REGMAP_AC97 + select AC97_BUS_COMPAT if AC97_BUS_NEW config SND_SOC_ZX_AUD96P22 tristate "ZTE ZX AUD96P22 CODEC" diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 7e4822185feb..df7220656d98 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -17,12 +17,15 @@ #include <linux/init.h> #include <linux/slab.h> +#include <linux/mfd/wm97xx.h> #include <linux/module.h> #include <linux/device.h> #include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/ac97_codec.h> +#include <sound/ac97/codec.h> +#include <sound/ac97/compat.h> #include <sound/initval.h> #include <sound/pcm_params.h> #include <sound/tlv.h> @@ -38,6 +41,7 @@ struct wm9713_priv { u32 pll_in; /* PLL input frequency */ unsigned int hp_mixer[2]; struct mutex lock; + struct wm97xx_platform_data *mfd_pdata; }; #define HPL_MIXER 0 @@ -1205,17 +1209,23 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) static int wm9713_soc_probe(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - struct regmap *regmap; + struct regmap *regmap = NULL; - wm9713->ac97 = snd_soc_new_ac97_codec(codec, WM9713_VENDOR_ID, - WM9713_VENDOR_ID_MASK); - if (IS_ERR(wm9713->ac97)) - return PTR_ERR(wm9713->ac97); - - regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); - if (IS_ERR(regmap)) { - snd_soc_free_ac97_codec(wm9713->ac97); - return PTR_ERR(regmap); + if (wm9713->mfd_pdata) { + wm9713->ac97 = wm9713->mfd_pdata->ac97; + regmap = wm9713->mfd_pdata->regmap; + } else { +#ifdef CONFIG_SND_SOC_AC97_BUS + wm9713->ac97 = snd_soc_new_ac97_codec(codec, WM9713_VENDOR_ID, + WM9713_VENDOR_ID_MASK); + if (IS_ERR(wm9713->ac97)) + return PTR_ERR(wm9713->ac97); + regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); + if (IS_ERR(regmap)) { + snd_soc_free_ac97_codec(wm9713->ac97); + return PTR_ERR(regmap); + } +#endif } snd_soc_codec_init_regmap(codec, regmap); @@ -1228,10 +1238,14 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) static int wm9713_soc_remove(struct snd_soc_codec *codec) { +#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - snd_soc_codec_exit_regmap(codec); - snd_soc_free_ac97_codec(wm9713->ac97); + if (!wm9713->mfd_pdata) { + snd_soc_codec_exit_regmap(codec); + snd_soc_free_ac97_codec(wm9713->ac97); + } +#endif return 0; } @@ -1262,6 +1276,7 @@ static int wm9713_probe(struct platform_device *pdev) mutex_init(&wm9713->lock); + wm9713->mfd_pdata = dev_get_platdata(&pdev->dev); platform_set_drvdata(pdev, wm9713); return snd_soc_register_codec(&pdev->dev, -- 2.14.1

1 0

[alsa-devel] [PATCH v2 0/3] Fix capture devices functionality on TM2
by Jaechul Lee 19 Sep '17

19 Sep '17

Hello, This patchset makes capture functionality working on TM2. Capture devices can't be detected because I2S doesn't have appropriate dai name. Therefore, TM2 will select unexpected cpu dai which is named "i2s-samsung-sec" that doesn't have a capture functionality. In samsung I2S driver, it tries to register two components without specific name. The driver finally has components having same name: dai name as well. As a result, dai_link doesn't have enough information to select cpu_dai properly. Changes in v2: - defined SAMSUNG_I2S_DAI_* in i2s.h and removed duplicated code - modified commit message about invalid parameter that Krzystof mentioned - rebased code because of conflicts in i2s.c Jaechul Lee (3): ASoC: samsung: i2s: Use specific name for i2s dais ASoC: samsung: Use 'samsung-i2s' cpu_dai for dai_links ASoC: samsung: Fix invalid argument when devm_gpiod_get is called sound/soc/samsung/i2s.c | 4 ++++ sound/soc/samsung/i2s.h | 3 +++ sound/soc/samsung/tm2_wm5110.c | 7 ++++--- 3 files changed, 11 insertions(+), 3 deletions(-) -- 2.14.1

3 8

[alsa-devel] [PATCH 0/3] Fix capture devices functionality on TM2
by Jaechul Lee 19 Sep '17

19 Sep '17

Hello, This patchset makes capture functionality working on TM2. Capture devices can't be detected because I2S doesn't have appropriate dai name. Therefore, TM2 will select unexpected cpu dai which is named "i2s-samsung-sec" that doesn't have a capture functionality. In samsung I2S driver, it tries to register two components without specific name. The driver finally has components having same name: dai name as well. As a result, dai_link doesn't have enough information to select cpu_dai properly. Jaechul Lee (3): ASoC: samsung: i2s: Use specific name for i2s dais ASoC: samsung: Use 'samsung-i2s' cpu_dai for dai_links ASoC: samsung: Fix invalid argument when devm_gpiod_get is called sound/soc/samsung/i2s.c | 6 ++++++ sound/soc/samsung/tm2_wm5110.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) -- 2.14.1

3 7

[alsa-devel] Applied "ASoC: rt5645: Make a few struct const" to the asoc tree
by Mark Brown 19 Sep '17

19 Sep '17

The patch ASoC: rt5645: Make a few struct const has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 72d7a16bb07582f8416bbcdc65fe2a1e63f11294 Mon Sep 17 00:00:00 2001 From: Jean Delvare <jdelvare(a)suse.de> Date: Fri, 15 Sep 2017 10:27:10 +0200 Subject: [PATCH] ASoC: rt5645: Make a few struct const These dmi_system_id structures and associated platform data are never modified so they can be marked const. Signed-off-by: Jean Delvare <jdelvare(a)suse.de> Cc: Bard Liao <bardliao(a)realtek.com> Cc: Oder Chiou <oder_chiou(a)realtek.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> -- sound/soc/codecs/rt5645.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/rt5645.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index a98647ac497c..4b2dbf0c3409 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3637,14 +3637,14 @@ static const struct dmi_system_id dmi_platform_gpd_win[] = { {} }; -static struct rt5645_platform_data general_platform_data2 = { +static const struct rt5645_platform_data general_platform_data2 = { .dmic1_data_pin = RT5645_DMIC_DATA_IN2N, .dmic2_data_pin = RT5645_DMIC2_DISABLE, .jd_mode = 3, .inv_jd1_1 = true, }; -static struct dmi_system_id dmi_platform_asus_t100ha[] = { +static const struct dmi_system_id dmi_platform_asus_t100ha[] = { { .ident = "ASUS T100HAN", .matches = { @@ -3655,11 +3655,11 @@ static struct dmi_system_id dmi_platform_asus_t100ha[] = { { } }; -static struct rt5645_platform_data minix_z83_4_platform_data = { +static const struct rt5645_platform_data minix_z83_4_platform_data = { .jd_mode = 3, }; -static struct dmi_system_id dmi_platform_minix_z83_4[] = { +static const struct dmi_system_id dmi_platform_minix_z83_4[] = { { .ident = "MINIX Z83-4", .matches = { -- 2.14.1

1 0