Re: [PATCH v3 3/5] regulator/axp20x: use axp2xx consolidated header

Jonathan Cameron
2014-09-13T20:01:57Z

On 12/09/14 00:15, Jacob Pan wrote:
> AXP20x driver has been extended to support axp288 variant. Header file
> and common data structures has also been renamed to suit the new
> scope of devices supported.
>
> This patch makes use of the renamed header and structure.
>
> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> ---
> drivers/regulator/axp20x-regulator.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
> index 004aadb..c9b6803 100644
> --- a/drivers/regulator/axp20x-regulator.c
> +++ b/drivers/regulator/axp20x-regulator.c
> @@ -20,7 +20,7 @@
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
> -#include <linux/mfd/axp20x.h>
> +#include <linux/mfd/axp2xx.h>
Err, doesn't this break bisection. Rename 'must' be done in one go, not
split across patches.
> #include <linux/regulator/driver.h>
> #include <linux/regulator/of_regulator.h>
>
> @@ -161,7 +161,7 @@ static struct of_regulator_match axp20x_matches[] = {
>
> static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
> {
> - struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> + struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>
> if (dcdcfreq < 750) {
> dcdcfreq = 750;
> @@ -232,7 +232,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
> static int axp20x_regulator_probe(struct platform_device *pdev)
> {
> struct regulator_dev *rdev;
> - struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> + struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> struct regulator_config config = { };
> struct regulator_init_data *init_data;
> int ret, i;
>