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

Commit 3480c0ca authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: ab8500-ext: Make the return type of ab8500_ext_regulator_exit() void 



ab8500_ext_regulator_exit() never fails.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e343ab08

drivers/regulator/ab8500-ext.c

+1 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) 
	return 0;

}



int ab8500_ext_regulator_exit(struct platform_device *pdev)

void ab8500_ext_regulator_exit(struct platform_device *pdev)

{

	int i;
@@ -407,8 +407,6 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev) 


		regulator_unregister(info->rdev);

	}



	return 0;

}



MODULE_LICENSE("GPL v2");

drivers/regulator/ab8500.c

+3 −6
Original line number Diff line number Diff line
@@ -3194,12 +3194,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev) 
		regulator_unregister(info->regulator);

	}



	if (!is_ab8505(ab8500)) {

	/* remove external regulators (after Vaux1, 2 and 3) */

		err = ab8500_ext_regulator_exit(pdev);

		if (err)

			return err;

	}

	if (!is_ab8505(ab8500))

		ab8500_ext_regulator_exit(pdev);



	/* remove regulator debug */

	err = ab8500_regulator_debug_exit(pdev);

include/linux/regulator/ab8500.h

+1 −1
Original line number Diff line number Diff line
@@ -338,6 +338,6 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev) 


/* AB8500 external regulator functions. */

int ab8500_ext_regulator_init(struct platform_device *pdev);

int ab8500_ext_regulator_exit(struct platform_device *pdev);

void ab8500_ext_regulator_exit(struct platform_device *pdev);



#endif