aboutsummaryrefslogtreecommitdiffstats
path: root/d10.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-30 15:37:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-30 15:37:22 +0100
commit946cb48082b0bbff0bb96b3f816d0327bf409d79 (patch)
treeddf24fb1cffad74877ccd6d4c3421cf8e6cc5bb8 /d10.patch
parent3c37d678907cad7f656ff2d3f1d7d9781cf90b58 (diff)
downloadpatches-946cb48082b0bbff0bb96b3f816d0327bf409d79.tar.gz
more patches updated
Diffstat (limited to 'd10.patch')
-rw-r--r--d10.patch200
1 files changed, 200 insertions, 0 deletions
diff --git a/d10.patch b/d10.patch
new file mode 100644
index 00000000000000..139450dce5dcfc
--- /dev/null
+++ b/d10.patch
@@ -0,0 +1,200 @@
+---
+ drivers/platform/x86/thinkpad_acpi.c | 91 ++++++++++-------------------------
+ 1 file changed, 28 insertions(+), 63 deletions(-)
+
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -1430,25 +1430,20 @@ static int tpacpi_rfk_procfs_write(const
+ */
+
+ /* interface_version --------------------------------------------------- */
+-static ssize_t tpacpi_driver_interface_version_show(
+- struct device_driver *drv,
+- char *buf)
++static ssize_t interface_version_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "0x%08x\n", TPACPI_SYSFS_VERSION);
+ }
+-
+-static DRIVER_ATTR(interface_version, S_IRUGO,
+- tpacpi_driver_interface_version_show, NULL);
++static DRIVER_ATTR_RO(interface_version);
+
+ /* debug_level --------------------------------------------------------- */
+-static ssize_t tpacpi_driver_debug_show(struct device_driver *drv,
+- char *buf)
++static ssize_t debug_level_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "0x%04x\n", dbg_level);
+ }
+
+-static ssize_t tpacpi_driver_debug_store(struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t debug_level_store(struct device_driver *drv, const char *buf,
++ size_t count)
+ {
+ unsigned long t;
+
+@@ -1459,34 +1454,28 @@ static ssize_t tpacpi_driver_debug_store
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
+- tpacpi_driver_debug_show, tpacpi_driver_debug_store);
++static DRIVER_ATTR_RW(debug_level);
+
+ /* version ------------------------------------------------------------- */
+-static ssize_t tpacpi_driver_version_show(struct device_driver *drv,
+- char *buf)
++static ssize_t version_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%s v%s\n",
+ TPACPI_DESC, TPACPI_VERSION);
+ }
+-
+-static DRIVER_ATTR(version, S_IRUGO,
+- tpacpi_driver_version_show, NULL);
++static DRIVER_ATTR_RO(version);
+
+ /* --------------------------------------------------------------------- */
+
+ #ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
+
+ /* wlsw_emulstate ------------------------------------------------------ */
+-static ssize_t tpacpi_driver_wlsw_emulstate_show(struct device_driver *drv,
+- char *buf)
++static ssize_t wlsw_emulstate_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%d\n", !!tpacpi_wlsw_emulstate);
+ }
+
+-static ssize_t tpacpi_driver_wlsw_emulstate_store(struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t wlsw_emulstate_store(struct device_driver *drv, const char *buf,
++ size_t count)
+ {
+ unsigned long t;
+
+@@ -1500,22 +1489,16 @@ static ssize_t tpacpi_driver_wlsw_emulst
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(wlsw_emulstate, S_IWUSR | S_IRUGO,
+- tpacpi_driver_wlsw_emulstate_show,
+- tpacpi_driver_wlsw_emulstate_store);
++static DRIVER_ATTR_RW(wlsw_emulstate);
+
+ /* bluetooth_emulstate ------------------------------------------------- */
+-static ssize_t tpacpi_driver_bluetooth_emulstate_show(
+- struct device_driver *drv,
+- char *buf)
++static ssize_t bluetooth_emulstate_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%d\n", !!tpacpi_bluetooth_emulstate);
+ }
+
+-static ssize_t tpacpi_driver_bluetooth_emulstate_store(
+- struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t bluetooth_emulstate_store(struct device_driver *drv,
++ const char *buf, size_t count)
+ {
+ unsigned long t;
+
+@@ -1526,22 +1509,16 @@ static ssize_t tpacpi_driver_bluetooth_e
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(bluetooth_emulstate, S_IWUSR | S_IRUGO,
+- tpacpi_driver_bluetooth_emulstate_show,
+- tpacpi_driver_bluetooth_emulstate_store);
++static DRIVER_ATTR_RW(bluetooth_emulstate);
+
+ /* wwan_emulstate ------------------------------------------------- */
+-static ssize_t tpacpi_driver_wwan_emulstate_show(
+- struct device_driver *drv,
+- char *buf)
++static ssize_t wwan_emulstate_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%d\n", !!tpacpi_wwan_emulstate);
+ }
+
+-static ssize_t tpacpi_driver_wwan_emulstate_store(
+- struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t wwan_emulstate_store(struct device_driver *drv, const char *buf,
++ size_t count)
+ {
+ unsigned long t;
+
+@@ -1552,22 +1529,16 @@ static ssize_t tpacpi_driver_wwan_emulst
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(wwan_emulstate, S_IWUSR | S_IRUGO,
+- tpacpi_driver_wwan_emulstate_show,
+- tpacpi_driver_wwan_emulstate_store);
++static DRIVER_ATTR_RW(wwan_emulstate);
+
+ /* uwb_emulstate ------------------------------------------------- */
+-static ssize_t tpacpi_driver_uwb_emulstate_show(
+- struct device_driver *drv,
+- char *buf)
++static ssize_t uwb_emulstate_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%d\n", !!tpacpi_uwb_emulstate);
+ }
+
+-static ssize_t tpacpi_driver_uwb_emulstate_store(
+- struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t uwb_emulstate_store(struct device_driver *drv, const char *buf,
++ size_t count)
+ {
+ unsigned long t;
+
+@@ -1578,10 +1549,7 @@ static ssize_t tpacpi_driver_uwb_emulsta
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(uwb_emulstate, S_IWUSR | S_IRUGO,
+- tpacpi_driver_uwb_emulstate_show,
+- tpacpi_driver_uwb_emulstate_store);
++static DRIVER_ATTR_RW(uwb_emulstate);
+ #endif
+
+ /* --------------------------------------------------------------------- */
+@@ -8516,14 +8484,13 @@ static ssize_t fan_fan2_input_show(struc
+ static DEVICE_ATTR(fan2_input, S_IRUGO, fan_fan2_input_show, NULL);
+
+ /* sysfs fan fan_watchdog (hwmon driver) ------------------------------- */
+-static ssize_t fan_fan_watchdog_show(struct device_driver *drv,
+- char *buf)
++static ssize_t fan_watchdog_show(struct device_driver *drv, char *buf)
+ {
+ return snprintf(buf, PAGE_SIZE, "%u\n", fan_watchdog_maxinterval);
+ }
+
+-static ssize_t fan_fan_watchdog_store(struct device_driver *drv,
+- const char *buf, size_t count)
++static ssize_t fan_watchdog_store(struct device_driver *drv, const char *buf,
++ size_t count)
+ {
+ unsigned long t;
+
+@@ -8540,9 +8507,7 @@ static ssize_t fan_fan_watchdog_store(st
+
+ return count;
+ }
+-
+-static DRIVER_ATTR(fan_watchdog, S_IWUSR | S_IRUGO,
+- fan_fan_watchdog_show, fan_fan_watchdog_store);
++static DRIVER_ATTR_RW(fan_watchdog);
+
+ /* --------------------------------------------------------------------- */
+ static struct attribute *fan_attributes[] = {
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 15:49:37 +0000