Commit 0aced355 authored by Keerthy's avatar Keerthy Committed by Lee Jones
Browse files

mfd: tps65218: Remove redundant read wrapper 



Currently read directly calls the repmap read function. Hence
remove the redundant wrapper and use regmap read wherever
needed.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 1001354c

drivers/gpio/gpio-tps65218.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/driver.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/mfd/tps65218.h>

#include <linux/mfd/tps65218.h>





struct tps65218_gpio {

struct tps65218_gpio {
@@ -30,7 +31,7 @@ static int tps65218_gpio_get(struct gpio_chip *gc, unsigned offset) 
	unsigned int val;

	unsigned int val;

	int ret;

	int ret;





	ret = tps65218_reg_read(tps65218, TPS65218_REG_ENABLE2, &val);

	ret = regmap_read(tps65218->regmap, TPS65218_REG_ENABLE2, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/mfd/tps65218.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -33,20 +33,6 @@ 




#define TPS65218_PASSWORD_REGS_UNLOCK   0x7D

#define TPS65218_PASSWORD_REGS_UNLOCK   0x7D





/**

 * tps65218_reg_read: Read a single tps65218 register.

 *

 * @tps: Device to read from.

 * @reg: Register to read.

 * @val: Contians the value

 */

int tps65218_reg_read(struct tps65218 *tps, unsigned int reg,

			unsigned int *val)

{

	return regmap_read(tps->regmap, reg, val);

}

EXPORT_SYMBOL_GPL(tps65218_reg_read);



/**

/**

 * tps65218_reg_write: Write a single tps65218 register.

 * tps65218_reg_write: Write a single tps65218 register.

 *

 *
@@ -93,7 +79,7 @@ static int tps65218_update_bits(struct tps65218 *tps, unsigned int reg, 
	int ret;

	int ret;

	unsigned int data;

	unsigned int data;





	ret = tps65218_reg_read(tps, reg, &data);

	ret = regmap_read(tps->regmap, reg, &data);

	if (ret) {

	if (ret) {

		dev_err(tps->dev, "Read from reg 0x%x failed\n", reg);

		dev_err(tps->dev, "Read from reg 0x%x failed\n", reg);

		return ret;

		return ret;
@@ -251,7 +237,7 @@ static int tps65218_probe(struct i2c_client *client, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	ret = tps65218_reg_read(tps, TPS65218_REG_CHIPID, &chipid);

	ret = regmap_read(tps->regmap, TPS65218_REG_CHIPID, &chipid);

	if (ret) {

	if (ret) {

		dev_err(tps->dev, "Failed to read chipid: %d\n", ret);

		dev_err(tps->dev, "Failed to read chipid: %d\n", ret);

		return ret;

		return ret;

drivers/regulator/tps65218-regulator.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/err.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>
@@ -272,7 +273,7 @@ static int tps65218_pmic_get_current_limit(struct regulator_dev *dev) 
	unsigned int index;

	unsigned int index;

	struct tps65218 *tps = rdev_get_drvdata(dev);

	struct tps65218 *tps = rdev_get_drvdata(dev);





	retval = tps65218_reg_read(tps, dev->desc->csel_reg, &index);

	retval = regmap_read(tps->regmap, dev->desc->csel_reg, &index);

	if (retval < 0)

	if (retval < 0)

		return retval;

		return retval;
@@ -383,7 +384,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev) 
		return PTR_ERR(rdev);

		return PTR_ERR(rdev);

	}

	}





	ret = tps65218_reg_read(tps, regulators[id].bypass_reg, &val);

	ret = regmap_read(tps->regmap, regulators[id].bypass_reg, &val);

	if (ret)

	if (ret)

		return ret;

		return ret;

include/linux/mfd/tps65218.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -284,8 +284,6 @@ struct tps65218 { 
	struct regmap *regmap;

	struct regmap *regmap;

};

};





int tps65218_reg_read(struct tps65218 *tps, unsigned int reg,

					unsigned int *val);

int tps65218_reg_write(struct tps65218 *tps, unsigned int reg,

int tps65218_reg_write(struct tps65218 *tps, unsigned int reg,

			unsigned int val, unsigned int level);

			unsigned int val, unsigned int level);

int tps65218_set_bits(struct tps65218 *tps, unsigned int reg,

int tps65218_set_bits(struct tps65218 *tps, unsigned int reg,