1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 1034d93fb838..1e88e8d66c55 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1215,12 +1215,10 @@ emalloc:
         return ret;
 }
 
-static int __exit i2c_pxa_remove(struct platform_device *dev)
+static int i2c_pxa_remove(struct platform_device *dev)
 {
         struct pxa_i2c *i2c = platform_get_drvdata(dev);
 
-        platform_set_drvdata(dev, NULL);
-
         i2c_del_adapter(&i2c->adap);
         if (!i2c->use_pio)
                 free_irq(i2c->irq, i2c);
@@ -1269,7 +1267,7 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = {
 
 static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
-        .remove         = __exit_p(i2c_pxa_remove),
+        .remove         = i2c_pxa_remove,
         .driver         = {
                 .name   = "pxa2xx-i2c",
                 .owner  = THIS_MODULE,