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

Commit 4177f95b authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

regulator: max8997: Use devm_regulator_register 



devm_* simplifies the code.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 8d581fd0

drivers/regulator/max8997.c

+10 −28
Original line number Original line Diff line number Diff line
@@ -1081,7 +1081,7 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
					pdata->buck1_voltage[i] +

					pdata->buck1_voltage[i] +

					buck1245_voltage_map_desc.step);

					buck1245_voltage_map_desc.step);

		if (ret < 0)

		if (ret < 0)

			goto err_out;

			return ret;





		max8997->buck2_vol[i] = ret =

		max8997->buck2_vol[i] = ret =

			max8997_get_voltage_proper_val(

			max8997_get_voltage_proper_val(
@@ -1090,7 +1090,7 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
					pdata->buck2_voltage[i] +

					pdata->buck2_voltage[i] +

					buck1245_voltage_map_desc.step);

					buck1245_voltage_map_desc.step);

		if (ret < 0)

		if (ret < 0)

			goto err_out;

			return ret;





		max8997->buck5_vol[i] = ret =

		max8997->buck5_vol[i] = ret =

			max8997_get_voltage_proper_val(

			max8997_get_voltage_proper_val(
@@ -1099,7 +1099,7 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
					pdata->buck5_voltage[i] +

					pdata->buck5_voltage[i] +

					buck1245_voltage_map_desc.step);

					buck1245_voltage_map_desc.step);

		if (ret < 0)

		if (ret < 0)

			goto err_out;

			return ret;





		if (max_buck1 < max8997->buck1_vol[i])

		if (max_buck1 < max8997->buck1_vol[i])

			max_buck1 = max8997->buck1_vol[i];

			max_buck1 = max8997->buck1_vol[i];
@@ -1143,24 +1143,23 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
				!gpio_is_valid(pdata->buck125_gpios[1]) ||

				!gpio_is_valid(pdata->buck125_gpios[1]) ||

				!gpio_is_valid(pdata->buck125_gpios[2])) {

				!gpio_is_valid(pdata->buck125_gpios[2])) {

			dev_err(&pdev->dev, "GPIO NOT VALID\n");

			dev_err(&pdev->dev, "GPIO NOT VALID\n");

			ret = -EINVAL;

			return -EINVAL;

			goto err_out;

		}

		}





		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[0],

		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[0],

					"MAX8997 SET1");

					"MAX8997 SET1");

		if (ret)

		if (ret)

			goto err_out;

			return ret;





		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[1],

		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[1],

					"MAX8997 SET2");

					"MAX8997 SET2");

		if (ret)

		if (ret)

			goto err_out;

			return ret;





		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[2],

		ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[2],

				"MAX8997 SET3");

				"MAX8997 SET3");

		if (ret)

		if (ret)

			goto err_out;

			return ret;





		gpio_direction_output(pdata->buck125_gpios[0],

		gpio_direction_output(pdata->buck125_gpios[0],

				(max8997->buck125_gpioindex >> 2)

				(max8997->buck125_gpioindex >> 2)
@@ -1205,33 +1204,17 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
		config.driver_data = max8997;

		config.driver_data = max8997;

		config.of_node = pdata->regulators[i].reg_node;

		config.of_node = pdata->regulators[i].reg_node;





		rdev[i] = regulator_register(&regulators[id], &config);

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

						  &config);

		if (IS_ERR(rdev[i])) {

		if (IS_ERR(rdev[i])) {

			ret = PTR_ERR(rdev[i]);

			dev_err(max8997->dev, "regulator init failed for %d\n",

			dev_err(max8997->dev, "regulator init failed for %d\n",

					id);

					id);

			rdev[i] = NULL;

			rdev[i] = NULL;

			goto err;

			return PTR_ERR(rdev[i]);

		}

		}

	}

	}





	return 0;

	return 0;

err:

	while (--i >= 0)

		regulator_unregister(rdev[i]);

err_out:

	return ret;

}



static int max8997_pmic_remove(struct platform_device *pdev)

{

	struct max8997_data *max8997 = platform_get_drvdata(pdev);

	struct regulator_dev **rdev = max8997->rdev;

	int i;



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

		regulator_unregister(rdev[i]);

	return 0;

}

}





static const struct platform_device_id max8997_pmic_id[] = {

static const struct platform_device_id max8997_pmic_id[] = {
@@ -1246,7 +1229,6 @@ static struct platform_driver max8997_pmic_driver = { 
		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

	},

	},

	.probe = max8997_pmic_probe,

	.probe = max8997_pmic_probe,

	.remove = max8997_pmic_remove,

	.id_table = max8997_pmic_id,

	.id_table = max8997_pmic_id,

};

};