Even if bus is not hot-pluggable, the devices can be unbound from the
driver via sysfs, so we should not be using __exit annotations on
remove() methods.

Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
---

Not tested - no hardware.

 drivers/mfd/menelaus.c | 4 ++--
 drivers/mfd/tps65010.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 998ce8c..fda3211 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1265,7 +1265,7 @@ fail1:
        return err;
 }
 
-static int __exit menelaus_remove(struct i2c_client *client)
+static int menelaus_remove(struct i2c_client *client)
 {
        struct menelaus_chip    *menelaus = i2c_get_clientdata(client);
 
@@ -1287,7 +1287,7 @@ static struct i2c_driver menelaus_i2c_driver = {
                .name           = DRIVER_NAME,
        },
        .probe          = menelaus_probe,
-       .remove         = __exit_p(menelaus_remove),
+       .remove         = menelaus_remove,
        .id_table       = menelaus_id,
 };
 
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index da2691f..9030233 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -514,7 +514,7 @@ static int tps65010_gpio_get(struct gpio_chip *chip, 
unsigned offset)
 
 static struct tps65010 *the_tps;
 
-static int __exit tps65010_remove(struct i2c_client *client)
+static int tps65010_remove(struct i2c_client *client)
 {
        struct tps65010         *tps = i2c_get_clientdata(client);
        struct tps65010_board   *board = client->dev.platform_data;
@@ -687,7 +687,7 @@ static struct i2c_driver tps65010_driver = {
                .name   = "tps65010",
        },
        .probe  = tps65010_probe,
-       .remove = __exit_p(tps65010_remove),
+       .remove = tps65010_remove,
        .id_table = tps65010_id,
 };
 
-- 
1.7.11.7


-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to