Commit dc553a79 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: max8649: Use devm_* APIs 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 268a1641

drivers/regulator/max8649.c

+6 −13
Original line number Diff line number Diff line
@@ -230,17 +230,18 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, 
	unsigned char data;

	int ret;



	info = kzalloc(sizeof(struct max8649_regulator_info), GFP_KERNEL);

	info = devm_kzalloc(&client->dev, sizeof(struct max8649_regulator_info),

			    GFP_KERNEL);

	if (!info) {

		dev_err(&client->dev, "No enough memory\n");

		return -ENOMEM;

	}



	info->regmap = regmap_init_i2c(client, &max8649_regmap_config);

	info->regmap = devm_regmap_init_i2c(client, &max8649_regmap_config);

	if (IS_ERR(info->regmap)) {

		ret = PTR_ERR(info->regmap);

		dev_err(&client->dev, "Failed to allocate register map: %d\n", ret);

		goto fail;

		return ret;

	}



	info->dev = &client->dev;
@@ -268,7 +269,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, 
	if (ret != 0) {

		dev_err(info->dev, "Failed to detect ID of MAX8649:%d\n",

			ret);

		goto out;

		return ret;

	}

	dev_info(info->dev, "Detected MAX8649 (ID:%x)\n", val);
@@ -306,16 +307,10 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, 
	if (IS_ERR(info->regulator)) {

		dev_err(info->dev, "failed to register regulator %s\n",

			dcdc_desc.name);

		ret = PTR_ERR(info->regulator);

		goto out;

		return PTR_ERR(info->regulator);

	}



	return 0;

out:

	regmap_exit(info->regmap);

fail:

	kfree(info);

	return ret;

}



static int __devexit max8649_regulator_remove(struct i2c_client *client)
@@ -325,8 +320,6 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client) 
	if (info) {

		if (info->regulator)

			regulator_unregister(info->regulator);

		regmap_exit(info->regmap);

		kfree(info);

	}



	return 0;