Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef4619c authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

mfd: Convert tps65217 to devm_regmap_init_i2c() 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1d88f7a0

drivers/mfd/tps65217.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ static int __devinit tps65217_probe(struct i2c_client *client, 
		return -ENOMEM;

		return -ENOMEM;





	tps->pdata = pdata;

	tps->pdata = pdata;

	tps->regmap = regmap_init_i2c(client, &tps65217_regmap_config);

	tps->regmap = devm_regmap_init_i2c(client, &tps65217_regmap_config);

	if (IS_ERR(tps->regmap)) {

	if (IS_ERR(tps->regmap)) {

		ret = PTR_ERR(tps->regmap);

		ret = PTR_ERR(tps->regmap);

		dev_err(tps->dev, "Failed to allocate register map: %d\n",

		dev_err(tps->dev, "Failed to allocate register map: %d\n",
@@ -163,9 +163,9 @@ static int __devinit tps65217_probe(struct i2c_client *client, 




	ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);

	ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(tps->dev, "Failed to read revision"

		dev_err(tps->dev, "Failed to read revision register: %d\n",

					" register: %d\n", ret);

			ret);

		goto err_regmap;

		return ret;

	}

	}





	dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",

	dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
@@ -190,11 +190,6 @@ static int __devinit tps65217_probe(struct i2c_client *client, 
	}

	}





	return 0;

	return 0;



err_regmap:

	regmap_exit(tps->regmap);



	return ret;

}

}





static int __devexit tps65217_remove(struct i2c_client *client)

static int __devexit tps65217_remove(struct i2c_client *client)
@@ -205,8 +200,6 @@ static int __devexit tps65217_remove(struct i2c_client *client) 
	for (i = 0; i < TPS65217_NUM_REGULATOR; i++)

	for (i = 0; i < TPS65217_NUM_REGULATOR; i++)

		platform_device_unregister(tps->regulator_pdev[i]);

		platform_device_unregister(tps->regulator_pdev[i]);





	regmap_exit(tps->regmap);



	return 0;

	return 0;

}

}