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

Unverified Commit 2564002a authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: dbx500-prcmu: Remove unused fields from struct dbx500_regulator_info 



The *dev is assigned but not used, remove it.
Current driver is using devm_regulator_register(), so no neeed to save
*rdev for clean up. Use a local variable instead.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92722a8f

drivers/regulator/db8500-prcmu.c

+5 −5
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ static int db8500_regulator_probe(struct platform_device *pdev) 
	struct regulator_init_data *db8500_init_data;

	struct dbx500_regulator_info *info;

	struct regulator_config config = { };

	struct regulator_dev *rdev;

	int err, i;



	db8500_init_data = dev_get_platdata(&pdev->dev);
@@ -446,17 +447,16 @@ static int db8500_regulator_probe(struct platform_device *pdev) 
	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {

		/* assign per-regulator data */

		info = &dbx500_regulator_info[i];

		info->dev = &pdev->dev;



		config.driver_data = info;

		config.dev = &pdev->dev;

		if (db8500_init_data)

			config.init_data = &db8500_init_data[i];



		info->rdev = devm_regulator_register(&pdev->dev, &info->desc,

		rdev = devm_regulator_register(&pdev->dev, &info->desc,

					       &config);

		if (IS_ERR(info->rdev)) {

			err = PTR_ERR(info->rdev);

		if (IS_ERR(rdev)) {

			err = PTR_ERR(rdev);

			dev_err(&pdev->dev, "failed to register %s: err %i\n",

				info->desc.name, err);

			return err;

drivers/regulator/dbx500-prcmu.h

+0 −4
Original line number Diff line number Diff line
@@ -15,18 +15,14 @@ 


/**

 * struct dbx500_regulator_info - dbx500 regulator information

 * @dev: device pointer

 * @desc: regulator description

 * @rdev: regulator device pointer

 * @is_enabled: status of the regulator

 * @epod_id: id for EPOD (power domain)

 * @is_ramret: RAM retention switch for EPOD (power domain)

 *

 */

struct dbx500_regulator_info {

	struct device *dev;

	struct regulator_desc desc;

	struct regulator_dev *rdev;

	bool is_enabled;

	u16 epod_id;

	bool is_ramret;