Merge tag 'iio-for-4.1a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[karo-tx-linux.git] / drivers / staging / iio / magnetometer / hmc5843_i2c.c

diff --git a/drivers/staging/iio/magnetometer/hmc5843_i2c.c b/drivers/staging/iio/magnetometer/hmc5843_i2c.c
index 2beff253bd0d935233b582ae5bcf22b611625cbd..ff08667fa2f60071ab6a5dd800830db2ae03b224 100644 (file)
--- a/drivers/staging/iio/magnetometer/hmc5843_i2c.c
+++ b/drivers/staging/iio/magnetometer/hmc5843_i2c.c
@@ -56,12 +56,12 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int hmc5843_i2c_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int hmc5843_i2c_probe(struct i2c_client *cli,
+                            const struct i2c_device_id *id)
 {
-       return hmc5843_common_probe(&client->dev,
-               devm_regmap_init_i2c(client, &hmc5843_i2c_regmap_config),
-               id->driver_data);
+       return hmc5843_common_probe(&cli->dev,
+                       devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config),
+                       id->driver_data);
 }
 
 static int hmc5843_i2c_remove(struct i2c_client *client)