1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 947a06a1845f..fd5fcb630685 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -52,7 +52,7 @@ static struct stmpe_client_info i2c_ci = {
         .write_block = i2c_block_write,
 };
 
-static int __devinit
+static int
 stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
 {
         i2c_ci.data = (void *)id;
@@ -63,7 +63,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
         return stmpe_probe(&i2c_ci, id->driver_data);
 }
 
-static int __devexit stmpe_i2c_remove(struct i2c_client *i2c)
+static int stmpe_i2c_remove(struct i2c_client *i2c)
 {
         struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);
 
@@ -82,13 +82,15 @@ static const struct i2c_device_id stmpe_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, stmpe_id);
 
 static struct i2c_driver stmpe_i2c_driver = {
-        .driver.name    = "stmpe-i2c",
-        .driver.owner   = THIS_MODULE,
+        .driver = {
+                .name = "stmpe-i2c",
+                .owner = THIS_MODULE,
 #ifdef CONFIG_PM
-        .driver.pm      = &stmpe_dev_pm_ops,
+                .pm = &stmpe_dev_pm_ops,
 #endif
+        },
         .probe          = stmpe_i2c_probe,
-        .remove         = __devexit_p(stmpe_i2c_remove),
+        .remove         = stmpe_i2c_remove,
         .id_table       = stmpe_i2c_id,
 };