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

Commit bf7b8113 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/drvdata' into regulator-next

parents 71c2dca1 405c5400

drivers/regulator/88pm8607.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,6 @@ static int pm8607_regulator_remove(struct platform_device *pdev) 
{

{

	struct pm8607_regulator_info *info = platform_get_drvdata(pdev);

	struct pm8607_regulator_info *info = platform_get_drvdata(pdev);





	platform_set_drvdata(pdev, NULL);

	regulator_unregister(info->regulator);

	regulator_unregister(info->regulator);

	return 0;

	return 0;

}

}

drivers/regulator/lp8788-buck.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -533,7 +533,6 @@ static int lp8788_buck_remove(struct platform_device *pdev) 
{

{

	struct lp8788_buck *buck = platform_get_drvdata(pdev);

	struct lp8788_buck *buck = platform_get_drvdata(pdev);





	platform_set_drvdata(pdev, NULL);

	regulator_unregister(buck->regulator);

	regulator_unregister(buck->regulator);





	return 0;

	return 0;

drivers/regulator/lp8788-ldo.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -561,7 +561,6 @@ static int lp8788_dldo_remove(struct platform_device *pdev) 
{

{

	struct lp8788_ldo *ldo = platform_get_drvdata(pdev);

	struct lp8788_ldo *ldo = platform_get_drvdata(pdev);





	platform_set_drvdata(pdev, NULL);

	regulator_unregister(ldo->regulator);

	regulator_unregister(ldo->regulator);





	return 0;

	return 0;
@@ -622,7 +621,6 @@ static int lp8788_aldo_remove(struct platform_device *pdev) 
{

{

	struct lp8788_ldo *ldo = platform_get_drvdata(pdev);

	struct lp8788_ldo *ldo = platform_get_drvdata(pdev);





	platform_set_drvdata(pdev, NULL);

	regulator_unregister(ldo->regulator);

	regulator_unregister(ldo->regulator);





	return 0;

	return 0;

drivers/regulator/max8925-regulator.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -327,7 +327,6 @@ static int max8925_regulator_remove(struct platform_device *pdev) 
{

{

	struct regulator_dev *rdev = platform_get_drvdata(pdev);

	struct regulator_dev *rdev = platform_get_drvdata(pdev);





	platform_set_drvdata(pdev, NULL);

	regulator_unregister(rdev);

	regulator_unregister(rdev);





	return 0;

	return 0;

drivers/regulator/mc13783-regulator.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -466,8 +466,6 @@ static int mc13783_regulator_remove(struct platform_device *pdev) 
	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);

	struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);

	int i;

	int i;





	platform_set_drvdata(pdev, NULL);



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

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

		regulator_unregister(priv->regulators[i]);

		regulator_unregister(priv->regulators[i]);