From: Nishanth Menon Date: Mon, 30 Jun 2014 15:57:37 +0000 (-0500) Subject: regulator: palmas: Rename palmas_regs_info to palmas_generic_regs_info X-Git-Tag: firefly_0821_release~176^2~3481^2~3^6~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6839cd6f6487969e969ced2245bfdabaf7005f6b;p=firefly-linux-kernel-4.4.55.git regulator: palmas: Rename palmas_regs_info to palmas_generic_regs_info With commit d6f83370ed978d5570b7c8c22988310cb9376202 (regulator: palmas: Add tps65917 PMIC support) palmas_regs_info naming is confusing as it is a driver data parameter and a local variable. To prevent mistaken updates, rename the local variable to palmas_generic_regs_info. Signed-off-by: Nishanth Menon Tested-by: Stephen Warren Tested-by: Keerthy Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index f75fb90d7db3..d6b734f397dc 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = { REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0), }; -static struct palmas_regs_info palmas_regs_info[] = { +static struct palmas_regs_info palmas_generic_regs_info[] = { { .name = "SMPS12", .sname = "smps1-in", @@ -1417,7 +1417,7 @@ static struct palmas_pmic_driver_data palmas_ddata = { .ldo_begin = PALMAS_REG_LDO1, .ldo_end = PALMAS_REG_LDOUSB, .max_reg = PALMAS_NUM_REGS, - .palmas_regs_info = palmas_regs_info, + .palmas_regs_info = palmas_generic_regs_info, .palmas_matches = palmas_matches, .sleep_req_info = palma_sleep_req_info, .smps_register = palmas_smps_registration,