hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: sy8106a: Get rid of struct sy8106a 

All the fields in struct sy8106a are only used in sy8106a_i2c_probe(), so
use local variables instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2019-04-20 11:01:25 +08:00 committed by Mark Brown
parent b9816363c0
commit 5d7ebba38b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/regulator/sy8106a-regulator.c
View File

@ -22,12 +22,6 @@
*/ */
#define SY8106A_GO_BIT BIT(7) #define SY8106A_GO_BIT BIT(7)
struct sy8106a {
struct regulator_dev *rdev;
struct regmap *regmap;
u32 fixed_voltage;
};
static const struct regmap_config sy8106a_regmap_config = { static const struct regmap_config sy8106a_regmap_config = {
.reg_bits = 8, .reg_bits = 8,
.val_bits = 8, .val_bits = 8,
@ -70,36 +64,32 @@ static const struct regulator_desc sy8106a_reg = {
static int sy8106a_i2c_probe(struct i2c_client *i2c, static int sy8106a_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct sy8106a *chip;
struct device *dev = &i2c->dev; struct device *dev = &i2c->dev;
struct regulator_dev *rdev = NULL; struct regulator_dev *rdev;
struct regulator_config config = { }; struct regulator_config config = { };
struct regmap *regmap;
unsigned int reg, vsel; unsigned int reg, vsel;
u32 fixed_voltage;
int error; int error;
chip = devm_kzalloc(&i2c->dev, sizeof(struct sy8106a), GFP_KERNEL);
if (!chip)
return -ENOMEM;
error = of_property_read_u32(dev->of_node, "silergy,fixed-microvolt", error = of_property_read_u32(dev->of_node, "silergy,fixed-microvolt",
&chip->fixed_voltage); &fixed_voltage);
if (error) if (error)
return error; return error;
if (chip->fixed_voltage < SY8106A_MIN_MV * 1000 || if (fixed_voltage < SY8106A_MIN_MV * 1000 ||
chip->fixed_voltage > SY8106A_MAX_MV * 1000) fixed_voltage > SY8106A_MAX_MV * 1000)
return -EINVAL; return -EINVAL;
chip->regmap = devm_regmap_init_i2c(i2c, &sy8106a_regmap_config); regmap = devm_regmap_init_i2c(i2c, &sy8106a_regmap_config);
if (IS_ERR(chip->regmap)) { if (IS_ERR(regmap)) {
error = PTR_ERR(chip->regmap); error = PTR_ERR(regmap);
dev_err(dev, "Failed to allocate register map: %d\n", error); dev_err(dev, "Failed to allocate register map: %d\n", error);
return error; return error;
} }
config.dev = &i2c->dev; config.dev = &i2c->dev;
config.regmap = chip->regmap; config.regmap = regmap;
config.driver_data = chip;
config.of_node = dev->of_node; config.of_node = dev->of_node;
config.init_data = of_get_regulator_init_data(dev, dev->of_node, config.init_data = of_get_regulator_init_data(dev, dev->of_node,
@ -109,15 +99,15 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,
return -ENOMEM; return -ENOMEM;
/* Ensure GO_BIT is enabled when probing */ /* Ensure GO_BIT is enabled when probing */
error = regmap_read(chip->regmap, SY8106A_REG_VOUT1_SEL, &reg); error = regmap_read(regmap, SY8106A_REG_VOUT1_SEL, &reg);
if (error) if (error)
return error; return error;
if (!(reg & SY8106A_GO_BIT)) { if (!(reg & SY8106A_GO_BIT)) {
vsel = (chip->fixed_voltage / 1000 - SY8106A_MIN_MV) / vsel = (fixed_voltage / 1000 - SY8106A_MIN_MV) /
SY8106A_STEP_MV; SY8106A_STEP_MV;
error = regmap_write(chip->regmap, SY8106A_REG_VOUT1_SEL, error = regmap_write(regmap, SY8106A_REG_VOUT1_SEL,
vsel | SY8106A_GO_BIT); vsel | SY8106A_GO_BIT);
if (error) if (error)
return error; return error;
@ -131,10 +121,6 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,
return error; return error;
} }
chip->rdev = rdev;
i2c_set_clientdata(i2c, chip);
return 0; return 0;
} }