Browse Source

mfd: 88pm860x: Use devm_regmap_init_i2c()

devm_regmap_init_i2c() is device managed and makes cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Sachin Kamat 12 years ago
parent
commit
aaaab4223e
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/mfd/88pm860x-core.c

+ 1 - 2
drivers/mfd/88pm860x-core.c

@@ -1155,7 +1155,7 @@ static int pm860x_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	chip->id = verify_addr(client);
-	chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
+	chip->regmap = devm_regmap_init_i2c(client, &pm860x_regmap_config);
 	if (IS_ERR(chip->regmap)) {
 		ret = PTR_ERR(chip->regmap);
 		dev_err(&client->dev, "Failed to allocate register map: %d\n",
@@ -1203,7 +1203,6 @@ static int pm860x_remove(struct i2c_client *client)
 		regmap_exit(chip->regmap_companion);
 		i2c_unregister_device(chip->companion);
 	}
-	regmap_exit(chip->regmap);
 	kfree(chip);
 	return 0;
 }