Re: [PATCH v5 2/3] regulator: rename dev_pdata to plat
On 4/19/23 15:45, Eugen Hristev wrote: > Simplify the subsystem by renaming `dev_pdata` to just `plat`. > No functional change, just trivial renaming. > > Suggested-by: Simon Glass > Signed-off-by: Eugen Hristev > Reviewed-by: Simon Glass > --- > Changes in v3,v4,v5: > - none > Changes in v2: > - this is a new patch > > drivers/power/regulator/fan53555.c | 10 ++-- > drivers/power/regulator/fixed.c| 16 +++ > drivers/power/regulator/gpio-regulator.c | 46 +-- > drivers/power/regulator/regulator_common.c | 53 +++--- > drivers/power/regulator/regulator_common.h | 8 ++-- > 5 files changed, 66 insertions(+), 67 deletions(-) > > diff --git a/drivers/power/regulator/fan53555.c > b/drivers/power/regulator/fan53555.c > index 5681206bbafe..815f96beef61 100644 > --- a/drivers/power/regulator/fan53555.c > +++ b/drivers/power/regulator/fan53555.c > @@ -101,7 +101,7 @@ struct fan53555_priv { > > static int fan53555_regulator_of_to_plat(struct udevice *dev) > { > - struct fan53555_plat *dev_pdata = dev_get_plat(dev); > + struct fan53555_plat *plat = dev_get_plat(dev); > struct dm_regulator_uclass_plat *uc_pdata = > dev_get_uclass_plat(dev); > u32 sleep_vsel; > @@ -118,12 +118,12 @@ static int fan53555_regulator_of_to_plat(struct udevice > *dev) >*/ > switch (sleep_vsel) { > case FAN53555_VSEL0: > - dev_pdata->sleep_reg = FAN53555_VSEL0; > - dev_pdata->vol_reg = FAN53555_VSEL1; > + plat->sleep_reg = FAN53555_VSEL0; > + plat->vol_reg = FAN53555_VSEL1; > break; > case FAN53555_VSEL1: > - dev_pdata->sleep_reg = FAN53555_VSEL1; > - dev_pdata->vol_reg = FAN53555_VSEL0; > + plat->sleep_reg = FAN53555_VSEL1; > + plat->vol_reg = FAN53555_VSEL0; > break; > default: > pr_err("%s: invalid vsel id %d\n", dev->name, sleep_vsel); > diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c > index 90004d1601a9..ad3b4b98d667 100644 > --- a/drivers/power/regulator/fixed.c > +++ b/drivers/power/regulator/fixed.c > @@ -24,16 +24,16 @@ struct fixed_clock_regulator_plat { > static int fixed_regulator_of_to_plat(struct udevice *dev) > { > struct dm_regulator_uclass_plat *uc_pdata; > - struct regulator_common_plat *dev_pdata; > + struct regulator_common_plat *plat; > > - dev_pdata = dev_get_plat(dev); > + plat = dev_get_plat(dev); > uc_pdata = dev_get_uclass_plat(dev); > if (!uc_pdata) > return -ENXIO; > > uc_pdata->type = REGULATOR_TYPE_FIXED; > > - return regulator_common_of_to_plat(dev, dev_pdata, "gpio"); > + return regulator_common_of_to_plat(dev, plat, "gpio"); > } > > static int fixed_regulator_get_value(struct udevice *dev) > @@ -88,7 +88,7 @@ static int fixed_clock_regulator_get_enable(struct udevice > *dev) > static int fixed_clock_regulator_set_enable(struct udevice *dev, bool enable) > { > struct fixed_clock_regulator_plat *priv = dev_get_priv(dev); > - struct regulator_common_plat *dev_pdata = dev_get_plat(dev); > + struct regulator_common_plat *plat = dev_get_plat(dev); > int ret = 0; > > if (enable) { > @@ -101,11 +101,11 @@ static int fixed_clock_regulator_set_enable(struct > udevice *dev, bool enable) > if (ret) > return ret; > > - if (enable && dev_pdata->startup_delay_us) > - udelay(dev_pdata->startup_delay_us); > + if (enable && plat->startup_delay_us) > + udelay(plat->startup_delay_us); > > - if (!enable && dev_pdata->off_on_delay_us) > - udelay(dev_pdata->off_on_delay_us); > + if (!enable && plat->off_on_delay_us) > + udelay(plat->off_on_delay_us); > > return ret; > } > diff --git a/drivers/power/regulator/gpio-regulator.c > b/drivers/power/regulator/gpio-regulator.c > index 9c0a68aa5af4..ded7be059bb0 100644 > --- a/drivers/power/regulator/gpio-regulator.c > +++ b/drivers/power/regulator/gpio-regulator.c > @@ -27,12 +27,12 @@ struct gpio_regulator_plat { > static int gpio_regulator_of_to_plat(struct udevice *dev) > { > struct dm_regulator_uclass_plat *uc_pdata; > - struct gpio_regulator_plat *dev_pdata; > + struct gpio_regulator_plat *plat; > struct gpio_desc *gpio; > int ret, count, i, j; > u32 states_array[GPIO_REGULATOR_MAX_STATES * 2]; > > - dev_pdata = dev_get_plat(dev); > + plat = dev_get_plat(dev); > uc_pdata = dev_get_uclass_plat(dev); > if (!uc_pdata) > return -ENXIO; > @@ -47,7 +47,7 @@ static int gpio_regulator_of_to_plat(struct udevice *dev) >* per gpio-regulator. As of now no instance with multiple >* gpios is presnt >*/ > - gpio = &dev_pdata->gpio; > + gpio = &plat->gpio; > ret = gpio_request_by_name(de
[PATCH v5 2/3] regulator: rename dev_pdata to plat
Simplify the subsystem by renaming `dev_pdata` to just `plat`. No functional change, just trivial renaming. Suggested-by: Simon Glass Signed-off-by: Eugen Hristev Reviewed-by: Simon Glass --- Changes in v3,v4,v5: - none Changes in v2: - this is a new patch drivers/power/regulator/fan53555.c | 10 ++-- drivers/power/regulator/fixed.c| 16 +++ drivers/power/regulator/gpio-regulator.c | 46 +-- drivers/power/regulator/regulator_common.c | 53 +++--- drivers/power/regulator/regulator_common.h | 8 ++-- 5 files changed, 66 insertions(+), 67 deletions(-) diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index 5681206bbafe..815f96beef61 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -101,7 +101,7 @@ struct fan53555_priv { static int fan53555_regulator_of_to_plat(struct udevice *dev) { - struct fan53555_plat *dev_pdata = dev_get_plat(dev); + struct fan53555_plat *plat = dev_get_plat(dev); struct dm_regulator_uclass_plat *uc_pdata = dev_get_uclass_plat(dev); u32 sleep_vsel; @@ -118,12 +118,12 @@ static int fan53555_regulator_of_to_plat(struct udevice *dev) */ switch (sleep_vsel) { case FAN53555_VSEL0: - dev_pdata->sleep_reg = FAN53555_VSEL0; - dev_pdata->vol_reg = FAN53555_VSEL1; + plat->sleep_reg = FAN53555_VSEL0; + plat->vol_reg = FAN53555_VSEL1; break; case FAN53555_VSEL1: - dev_pdata->sleep_reg = FAN53555_VSEL1; - dev_pdata->vol_reg = FAN53555_VSEL0; + plat->sleep_reg = FAN53555_VSEL1; + plat->vol_reg = FAN53555_VSEL0; break; default: pr_err("%s: invalid vsel id %d\n", dev->name, sleep_vsel); diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 90004d1601a9..ad3b4b98d667 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -24,16 +24,16 @@ struct fixed_clock_regulator_plat { static int fixed_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct regulator_common_plat *dev_pdata; + struct regulator_common_plat *plat; - dev_pdata = dev_get_plat(dev); + plat = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO; uc_pdata->type = REGULATOR_TYPE_FIXED; - return regulator_common_of_to_plat(dev, dev_pdata, "gpio"); + return regulator_common_of_to_plat(dev, plat, "gpio"); } static int fixed_regulator_get_value(struct udevice *dev) @@ -88,7 +88,7 @@ static int fixed_clock_regulator_get_enable(struct udevice *dev) static int fixed_clock_regulator_set_enable(struct udevice *dev, bool enable) { struct fixed_clock_regulator_plat *priv = dev_get_priv(dev); - struct regulator_common_plat *dev_pdata = dev_get_plat(dev); + struct regulator_common_plat *plat = dev_get_plat(dev); int ret = 0; if (enable) { @@ -101,11 +101,11 @@ static int fixed_clock_regulator_set_enable(struct udevice *dev, bool enable) if (ret) return ret; - if (enable && dev_pdata->startup_delay_us) - udelay(dev_pdata->startup_delay_us); + if (enable && plat->startup_delay_us) + udelay(plat->startup_delay_us); - if (!enable && dev_pdata->off_on_delay_us) - udelay(dev_pdata->off_on_delay_us); + if (!enable && plat->off_on_delay_us) + udelay(plat->off_on_delay_us); return ret; } diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 9c0a68aa5af4..ded7be059bb0 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -27,12 +27,12 @@ struct gpio_regulator_plat { static int gpio_regulator_of_to_plat(struct udevice *dev) { struct dm_regulator_uclass_plat *uc_pdata; - struct gpio_regulator_plat *dev_pdata; + struct gpio_regulator_plat *plat; struct gpio_desc *gpio; int ret, count, i, j; u32 states_array[GPIO_REGULATOR_MAX_STATES * 2]; - dev_pdata = dev_get_plat(dev); + plat = dev_get_plat(dev); uc_pdata = dev_get_uclass_plat(dev); if (!uc_pdata) return -ENXIO; @@ -47,7 +47,7 @@ static int gpio_regulator_of_to_plat(struct udevice *dev) * per gpio-regulator. As of now no instance with multiple * gpios is presnt */ - gpio = &dev_pdata->gpio; + gpio = &plat->gpio; ret = gpio_request_by_name(dev, "gpios", 0, gpio, GPIOD_IS_OUT); if (ret) debug("regulator gpio - not found! Error: %d", ret); @@ -68,21 +68,21 @@ static int gpio_regulator_of