The patch titled
hdaps: Add explicit hardware configuration functions - fix
has been added to the -mm tree. Its filename is
hdaps-add-explicit-hardware-configuration-functions-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: hdaps: Add explicit hardware configuration functions - fix
From: "Shem Multinymous" <multinymous@xxxxxxxxx>
Fixes two things about hdaps_check_ec() in the hdaps driver:
1. Remove the __init, it may be called well after module init, during resume.
2. Remove an unused parameter.
Signed-off-by: Shem Multinymous <multinymous@xxxxxxxxx>
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/hwmon/hdaps.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/hwmon/hdaps.c~hdaps-add-explicit-hardware-configuration-functions-fix drivers/hwmon/hdaps.c
--- a/drivers/hwmon/hdaps.c~hdaps-add-explicit-hardware-configuration-functions-fix
+++ a/drivers/hwmon/hdaps.c
@@ -305,7 +305,7 @@ static int hdaps_get_ec_mode(u8 *mode)
* Follows the clean-room spec for HDAPS; we don't know what it means.
* Returns zero on success and negative error code on failure. Can sleep.
*/
-static int __init hdaps_check_ec(u8 *mode)
+static int hdaps_check_ec()
{
const struct thinkpad_ec_row args =
{ .mask=0x0003, .val={0x17, 0x81} };
@@ -343,7 +343,7 @@ static int hdaps_device_init(void)
if (mode==0x00)
{ ABORT_INIT("accelerometer not available"); goto bad; }
- if (hdaps_check_ec(&mode))
+ if (hdaps_check_ec())
{ ABORT_INIT("hdaps_check_ec failed"); goto bad; }
if (hdaps_set_power(1))
_
Patches currently in -mm which might be from multinymous@xxxxxxxxx are
dmi-decode-and-save-oem-string-information.patch
thinkpad_ec-new-driver-for-thinkpad-embedded-controller-access.patch
hdaps-use-thinkpad_ec-instead-of-direct-port-access.patch
hdaps-unify-and-cache-hdaps-readouts.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
hdaps-correct-readout-and-remove-nonsensical-attributes.patch
hdaps-remember-keyboard-and-mouse-activity.patch
hdaps-limit-hardware-query-rate.patch
hdaps-delay-calibration-to-first-hardware-query.patch
hdaps-add-explicit-hardware-configuration-functions.patch
hdaps-add-explicit-hardware-configuration-functions-fix.patch
hdaps-add-new-sysfs-attributes.patch
hdaps-power-off-accelerometer-on-suspend-and-unload.patch
hdaps-stop-polling-timer-when-suspended.patch
hdaps-simplify-whitelist.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
