Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 640c24a7 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: max77693: Remove state container as it is not needed 



Don't store pointers to regulator_dev returned by
devm_regulator_register() in allocated memory in state container. They
aren't used anywhere outside of max77693_pmic_probe() function.

This change allows removing completely the 'struct max77693_pmic_dev'
state container as none of its fields are used outside of probe.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d9aa5c56

drivers/regulator/max77693.c

+6 −31
Original line number Original line Diff line number Diff line
@@ -34,13 +34,6 @@ 




#define CHGIN_ILIM_STEP_20mA			20000

#define CHGIN_ILIM_STEP_20mA			20000





struct max77693_pmic_dev {

	struct device *dev;

	struct max77693_dev *iodev;

	int num_regulators;

	struct regulator_dev **rdev;

};



/* CHARGER regulator ops */

/* CHARGER regulator ops */

/* CHARGER regulator uses two bits for enabling */

/* CHARGER regulator uses two bits for enabling */

static int max77693_chg_is_enabled(struct regulator_dev *rdev)

static int max77693_chg_is_enabled(struct regulator_dev *rdev)
@@ -232,7 +225,6 @@ static int max77693_pmic_init_rdata(struct device *dev, 
static int max77693_pmic_probe(struct platform_device *pdev)

static int max77693_pmic_probe(struct platform_device *pdev)

{

{

	struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	struct max77693_pmic_dev *max77693_pmic;

	struct max77693_regulator_data *rdata = NULL;

	struct max77693_regulator_data *rdata = NULL;

	int num_rdata, i;

	int num_rdata, i;

	struct regulator_config config;

	struct regulator_config config;
@@ -243,39 +235,22 @@ static int max77693_pmic_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	max77693_pmic = devm_kzalloc(&pdev->dev,

				sizeof(struct max77693_pmic_dev),

				GFP_KERNEL);

	if (!max77693_pmic)

		return -ENOMEM;



	max77693_pmic->rdev = devm_kzalloc(&pdev->dev,

				sizeof(struct regulator_dev *) * num_rdata,

				GFP_KERNEL);

	if (!max77693_pmic->rdev)

		return -ENOMEM;



	max77693_pmic->dev = &pdev->dev;

	max77693_pmic->iodev = iodev;

	max77693_pmic->num_regulators = num_rdata;



	config.dev = &pdev->dev;

	config.dev = &pdev->dev;

	config.regmap = iodev->regmap;

	config.regmap = iodev->regmap;

	config.driver_data = max77693_pmic;

	platform_set_drvdata(pdev, max77693_pmic);





	for (i = 0; i < max77693_pmic->num_regulators; i++) {

	for (i = 0; i < num_rdata; i++) {

		int id = rdata[i].id;

		int id = rdata[i].id;

		struct regulator_dev *rdev;





		config.init_data = rdata[i].initdata;

		config.init_data = rdata[i].initdata;

		config.of_node = rdata[i].of_node;

		config.of_node = rdata[i].of_node;





		max77693_pmic->rdev[i] = devm_regulator_register(&pdev->dev,

		rdev = devm_regulator_register(&pdev->dev,

						&regulators[id], &config);

						&regulators[id], &config);

		if (IS_ERR(max77693_pmic->rdev[i])) {

		if (IS_ERR(rdev)) {

			dev_err(max77693_pmic->dev,

			dev_err(&pdev->dev,

				"Failed to initialize regulator-%d\n", id);

				"Failed to initialize regulator-%d\n", id);

			return PTR_ERR(max77693_pmic->rdev[i]);

			return PTR_ERR(rdev);

		}

		}

	}

	}