summary refs log tree commit diff
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-03-09 10:49:36 -0700
committerLee Jones <lee.jones@linaro.org>2015-03-23 11:47:38 +0000
commiteac8a5c91b9ec19abc770c62c375feeaceada2a4 (patch)
tree28186a1dc4a7d5596e22c875c2fc08b31117edb2
parent7faff71bc94eb598328d315a37486f23d5febdf0 (diff)
downloadlinux-eac8a5c91b9ec19abc770c62c375feeaceada2a4.tar.gz
mfd: menelaus: Remove incorrect __exit markups
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. The only exception is drivers registered with
platform_driver_probe() which specifically disables sysfs bind/unbind
attributes.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/menelaus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 9f01aef539dd..5269ff2f29bc 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1259,7 +1259,7 @@ fail:
 	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);
 
@@ -1280,7 +1280,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,
 };