Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / cros_ec_i2c.c

diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
index 123044608b63dc5997f9cf921003814f9ac53f84..4f71be99a183713810c5d00e7f4eac480e006a58 100644 (file)
--- a/drivers/mfd/cros_ec_i2c.c
+++ b/drivers/mfd/cros_ec_i2c.c
@@ -120,7 +120,7 @@ static int cros_ec_command_xfer(struct cros_ec_device *ec_dev,
        return ret;
 }
 
-static int cros_ec_probe_i2c(struct i2c_client *client,
+static int cros_ec_i2c_probe(struct i2c_client *client,
                             const struct i2c_device_id *dev_id)
 {
        struct device *dev = &client->dev;
@@ -150,7 +150,7 @@ static int cros_ec_probe_i2c(struct i2c_client *client,
        return 0;
 }
 
-static int cros_ec_remove_i2c(struct i2c_client *client)
+static int cros_ec_i2c_remove(struct i2c_client *client)
 {
        struct cros_ec_device *ec_dev = i2c_get_clientdata(client);
 
@@ -190,8 +190,8 @@ static struct i2c_driver cros_ec_driver = {
                .owner  = THIS_MODULE,
                .pm     = &cros_ec_i2c_pm_ops,
        },
-       .probe          = cros_ec_probe_i2c,
-       .remove         = cros_ec_remove_i2c,
+       .probe          = cros_ec_i2c_probe,
+       .remove         = cros_ec_i2c_remove,
        .id_table       = cros_ec_i2c_id,
 };