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

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

regulator: isl6271a: Convert to get_voltage_sel 



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

drivers/regulator/isl6271a-regulator.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -35,26 +35,19 @@ struct isl_pmic { 
	struct mutex		mtx;

	struct mutex		mtx;

};

};





static int isl6271a_get_voltage(struct regulator_dev *dev)

static int isl6271a_get_voltage_sel(struct regulator_dev *dev)

{

{

	struct isl_pmic *pmic = rdev_get_drvdata(dev);

	struct isl_pmic *pmic = rdev_get_drvdata(dev);

	int idx, data;

	int idx;





	mutex_lock(&pmic->mtx);

	mutex_lock(&pmic->mtx);





	idx = i2c_smbus_read_byte(pmic->client);

	idx = i2c_smbus_read_byte(pmic->client);

	if (idx < 0) {

	if (idx < 0)

		dev_err(&pmic->client->dev, "Error getting voltage\n");

		dev_err(&pmic->client->dev, "Error getting voltage\n");

		data = idx;

		goto out;

	}



	/* Convert the data from chip to microvolts */

	data = ISL6271A_VOLTAGE_MIN + (ISL6271A_VOLTAGE_STEP * (idx & 0xf));





out:

	mutex_unlock(&pmic->mtx);

	mutex_unlock(&pmic->mtx);

	return data;

	return idx;

}

}





static int isl6271a_set_voltage(struct regulator_dev *dev,

static int isl6271a_set_voltage(struct regulator_dev *dev,
@@ -84,7 +77,7 @@ static int isl6271a_set_voltage(struct regulator_dev *dev, 
}

}





static struct regulator_ops isl_core_ops = {

static struct regulator_ops isl_core_ops = {

	.get_voltage	= isl6271a_get_voltage,

	.get_voltage_sel = isl6271a_get_voltage_sel,

	.set_voltage	= isl6271a_set_voltage,

	.set_voltage	= isl6271a_set_voltage,

	.list_voltage	= regulator_list_voltage_linear,

	.list_voltage	= regulator_list_voltage_linear,

};

};