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

Commit d18a9662 authored by Steven Price's avatar Steven Price Committed by Rob Herring
Browse files

drm/panfrost: Remove NULL checks for regulator 



devm_regulator_get() is now used to populate pfdev->regulator which
ensures that this cannot be NULL (a dummy regulator will be returned if
necessary). So remove the checks in panfrost_devfreq_target().

Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/3e3a2c8a-b4fc-8af6-39e1-b26160db2c7c@arm.com
parent edfa0750

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+4 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, 
	 * If frequency scaling from low to high, adjust voltage first.

	 * If frequency scaling from high to low, adjust frequency first.

	 */

	if (old_clk_rate < target_rate && pfdev->regulator) {

	if (old_clk_rate < target_rate) {

		err = regulator_set_voltage(pfdev->regulator, target_volt,

					    target_volt);

		if (err) {
@@ -53,14 +53,12 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, 
	if (err) {

		dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate,

			err);

		if (pfdev->regulator)

			regulator_set_voltage(pfdev->regulator,

					      pfdev->devfreq.cur_volt,

		regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,

				      pfdev->devfreq.cur_volt);

		return err;

	}



	if (old_clk_rate > target_rate && pfdev->regulator) {

	if (old_clk_rate > target_rate) {

		err = regulator_set_voltage(pfdev->regulator, target_volt,

					    target_volt);

		if (err)