1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c
index b76a29d1f8e4..008836409efe 100644
--- a/drivers/i2c/busses/i2c-s6000.c
+++ b/drivers/i2c/busses/i2c-s6000.c
@@ -248,7 +248,7 @@ static struct i2c_algorithm s6i2c_algorithm = {
         .functionality = s6i2c_functionality,
 };
 
-static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
+static u16 nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
 {
         u32 dividend = ((clk_get_rate(iface->clk) / 1000) * ns) / 1000000;
         if (dividend > 0xffff)
@@ -256,7 +256,7 @@ static u16 __devinit nanoseconds_on_clk(struct s6i2c_if *iface, u32 ns)
         return dividend;
 }
 
-static int __devinit s6i2c_probe(struct platform_device *dev)
+static int s6i2c_probe(struct platform_device *dev)
 {
         struct s6i2c_if *iface = &s6i2c_if;
         struct i2c_adapter *p_adap;
@@ -361,7 +361,7 @@ err_out:
         return rc;
 }
 
-static int __devexit s6i2c_remove(struct platform_device *pdev)
+static int s6i2c_remove(struct platform_device *pdev)
 {
         struct s6i2c_if *iface = platform_get_drvdata(pdev);
         i2c_wr16(iface, S6_I2C_ENABLE, 0);
@@ -378,7 +378,7 @@ static int __devexit s6i2c_remove(struct platform_device *pdev)
 
 static struct platform_driver s6i2c_driver = {
         .probe          = s6i2c_probe,
-        .remove         = __devexit_p(s6i2c_remove),
+        .remove         = s6i2c_remove,
         .driver         = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,