summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-01 13:00:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-01 13:00:28 -0500
commit47fcc0360cfb3fe82e4daddacad3c1cd80b0b75d (patch)
tree6a72f705c4e16643e08152ce7828a23c68c623ae /sound
parent5d8515bc232172963a4cef007e97b08c5e4d0533 (diff)
parentc505cbd45f6e9c539d57dd171d95ec7e5e9f9cd0 (diff)
Merge tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the set of "big" driver core patches for 4.16-rc1. The majority of the work here is in the firmware subsystem, with reworks to try to attempt to make the code easier to handle in the long run, but no functional change. There's also some tree-wide sysfs attribute fixups with lots of acks from the various subsystem maintainers, as well as a handful of other normal fixes and changes. And finally, some license cleanups for the driver core and sysfs code. All have been in linux-next for a while with no reported issues" * tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (48 commits) device property: Define type of PROPERTY_ENRTY_*() macros device property: Reuse property_entry_free_data() device property: Move property_entry_free_data() upper firmware: Fix up docs referring to FIRMWARE_IN_KERNEL firmware: Drop FIRMWARE_IN_KERNEL Kconfig option USB: serial: keyspan: Drop firmware Kconfig options sysfs: remove DEBUG defines sysfs: use SPDX identifiers drivers: base: add coredump driver ops sysfs: add attribute specification for /sysfs/devices/.../coredump test_firmware: fix missing unlock on error in config_num_requests_store() test_firmware: make local symbol test_fw_config static sysfs: turn WARN() into pr_warn() firmware: Fix a typo in fallback-mechanisms.rst treewide: Use DEVICE_ATTR_WO treewide: Use DEVICE_ATTR_RO treewide: Use DEVICE_ATTR_RW sysfs.h: Use octal permissions component: add debugfs support bus: simple-pm-bus: convert bool SIMPLE_PM_BUS to tristate ...
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/mcbsp.c4
-rw-r--r--sound/soc/soc-core.c2
-rw-r--r--sound/soc/soc-dapm.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 7a54e3083203..79d4dc785e5c 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -854,7 +854,7 @@ unlock:
854 return size; 854 return size;
855} 855}
856 856
857static DEVICE_ATTR(dma_op_mode, 0644, dma_op_mode_show, dma_op_mode_store); 857static DEVICE_ATTR_RW(dma_op_mode);
858 858
859static const struct attribute *additional_attrs[] = { 859static const struct attribute *additional_attrs[] = {
860 &dev_attr_max_tx_thres.attr, 860 &dev_attr_max_tx_thres.attr,
@@ -923,7 +923,7 @@ out:
923 return size; 923 return size;
924} 924}
925 925
926static DEVICE_ATTR(st_taps, 0644, st_taps_show, st_taps_store); 926static DEVICE_ATTR_RW(st_taps);
927 927
928static const struct attribute *sidetone_attrs[] = { 928static const struct attribute *sidetone_attrs[] = {
929 &dev_attr_st_taps.attr, 929 &dev_attr_st_taps.attr,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e91879569a0f..88efc84f3e7b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -173,7 +173,7 @@ static ssize_t codec_reg_show(struct device *dev,
173 return soc_codec_reg_show(rtd->codec, buf, PAGE_SIZE, 0); 173 return soc_codec_reg_show(rtd->codec, buf, PAGE_SIZE, 0);
174} 174}
175 175
176static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL); 176static DEVICE_ATTR_RO(codec_reg);
177 177
178static ssize_t pmdown_time_show(struct device *dev, 178static ssize_t pmdown_time_show(struct device *dev,
179 struct device_attribute *attr, char *buf) 179 struct device_attribute *attr, char *buf)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index a10b21cfc31e..d1977ced895f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2364,7 +2364,7 @@ static ssize_t dapm_widget_show(struct device *dev,
2364 return count; 2364 return count;
2365} 2365}
2366 2366
2367static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); 2367static DEVICE_ATTR_RO(dapm_widget);
2368 2368
2369struct attribute *soc_dapm_dev_attrs[] = { 2369struct attribute *soc_dapm_dev_attrs[] = {
2370 &dev_attr_dapm_widget.attr, 2370 &dev_attr_dapm_widget.attr,