macintosh/hwmon/ams: Fix device removal sequence

Some code that is in ams_exit() (the module exit code) should instead
be called when the device (not module) is removed. It probably doesn't
make much of a difference in the PMU case, but in the I2C case it does
matter.

I make no guarantee that my fix isn't racy, I'm not familiar enough
with the ams driver code to tell for sure.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stelian Pop <stelian@popies.net>
Cc: Michael Hanselmann <linux-kernel@hansmi.ch>
Cc: stable@kernel.org
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index 6c9ace1b76f6db6ca810c5cf2c7cb89889da7984..2ad62c339cd2c9cf849dc3a551a8d47548ef2190 100644 (file)
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -213,7 +213,7 @@ int __init ams_init(void)
        return -ENODEV;
 }
 
-void ams_exit(void)
+void ams_sensor_detach(void)
 {
        /* Remove input device */
        ams_input_exit();
@@ -221,9 +221,6 @@ void ams_exit(void)
        /* Remove attributes */
        device_remove_file(&ams_info.of_dev->dev, &dev_attr_current);
 
-       /* Shut down implementation */
-       ams_info.exit();
-
        /* Flush interrupt worker
         *
         * We do this after ams_info.exit(), because an interrupt might
@@ -239,6 +236,12 @@ void ams_exit(void)
        pmf_unregister_irq_client(&ams_freefall_client);
 }
 
+static void __exit ams_exit(void)
+{
+       /* Shut down implementation */
+       ams_info.exit();
+}
+
 MODULE_AUTHOR("Stelian Pop, Michael Hanselmann");
 MODULE_DESCRIPTION("Apple Motion Sensor driver");
 MODULE_LICENSE("GPL");

diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index 2cbf8a6506c7e8fad72736773efa238367bf03f5..abeecd27b484fe2345f3c01dda91b7f74f079cd6 100644 (file)
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -238,6 +238,8 @@ static int ams_i2c_probe(struct i2c_client *client,
 static int ams_i2c_remove(struct i2c_client *client)
 {
        if (ams_info.has_device) {
+               ams_sensor_detach();
+
                /* Disable interrupts */
                ams_i2c_set_irq(AMS_IRQ_ALL, 0);
 

diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
index fb18b3d3162bcebfe908fa5c678ccf6893fdb25d..4f61b3ee1b08b4ca0ee65f018becb0ef7128892e 100644 (file)
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -133,6 +133,8 @@ static void ams_pmu_get_xyz(s8 *x, s8 *y, s8 *z)
 
 static void ams_pmu_exit(void)
 {
+       ams_sensor_detach();
+
        /* Disable interrupts */
        ams_pmu_set_irq(AMS_IRQ_ALL, 0);
 

diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h
index 5ed387b0bd9aa08185e05bd790ac06976a8a7bed..b28d7e27a031727bc7cc83c18d28b9fc15b2160a 100644 (file)
--- a/drivers/hwmon/ams/ams.h
+++ b/drivers/hwmon/ams/ams.h
@@ -61,6 +61,7 @@ extern struct ams ams_info;
 
 extern void ams_sensors(s8 *x, s8 *y, s8 *z);
 extern int ams_sensor_attach(void);
+extern void ams_sensor_detach(void);
 
 extern int ams_pmu_init(struct device_node *np);
 extern int ams_i2c_init(struct device_node *np);