tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

regulator: sy8824x: add prefixes to BUCK_EN and MODE macros

Add prefixes to BUCK_EN and MODE macros to namespace them.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/20190829143927.395d0385@xhacker.debian
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Jisheng Zhang and committed by
Mark Brown e02e23d5 dab10674

+8 -6
+8 -6
drivers/regulator/sy8824x.c
··· 13 13 #include <linux/regulator/driver.h> 14 14 #include <linux/regulator/of_regulator.h> 15 15 16 - #define BUCK_EN (1 << 7) 17 - #define MODE (1 << 6) 16 + #define SY8824C_BUCK_EN (1 << 7) 17 + #define SY8824C_MODE (1 << 6) 18 18 19 19 struct sy8824_config { 20 20 /* registers */ ··· 41 41 42 42 switch (mode) { 43 43 case REGULATOR_MODE_FAST: 44 - regmap_update_bits(rdev->regmap, cfg->mode_reg, MODE, MODE); 44 + regmap_update_bits(rdev->regmap, cfg->mode_reg, 45 + SY8824C_MODE, SY8824C_MODE); 45 46 break; 46 47 case REGULATOR_MODE_NORMAL: 47 - regmap_update_bits(rdev->regmap, cfg->mode_reg, MODE, 0); 48 + regmap_update_bits(rdev->regmap, cfg->mode_reg, 49 + SY8824C_MODE, 0); 48 50 break; 49 51 default: 50 52 return -EINVAL; ··· 64 62 ret = regmap_read(rdev->regmap, cfg->mode_reg, &val); 65 63 if (ret < 0) 66 64 return ret; 67 - if (val & MODE) 65 + if (val & SY8824C_MODE) 68 66 return REGULATOR_MODE_FAST; 69 67 else 70 68 return REGULATOR_MODE_NORMAL; ··· 96 94 rdesc->type = REGULATOR_VOLTAGE; 97 95 rdesc->n_voltages = cfg->vsel_count; 98 96 rdesc->enable_reg = cfg->enable_reg; 99 - rdesc->enable_mask = BUCK_EN; 97 + rdesc->enable_mask = SY8824C_BUCK_EN; 100 98 rdesc->min_uV = cfg->vsel_min; 101 99 rdesc->uV_step = cfg->vsel_step; 102 100 rdesc->vsel_reg = cfg->vol_reg;