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

Unverified Commit 02f37039 authored by Douglas Anderson's avatar Douglas Anderson Committed by Mark Brown
Browse files

regulator: Don't return or expect -errno from of_map_mode() 



In of_get_regulation_constraints() we were taking the result of
of_map_mode() (an unsigned int) and assigning it to an int.  We were
then checking whether this value was -EINVAL.  Some implementers of
of_map_mode() were returning -EINVAL (even though the return type of
their function needed to be unsigned int) because they needed to
signal an error back to of_get_regulation_constraints().

In general in the regulator framework the mode is always referred to
as an unsigned int.  While we could fix this to be a signed int (the
highest value we store in there right now is 0x8), it's actually
pretty clean to just define the regulator mode 0x0 (the lack of any
bits set) as an invalid mode.  Let's do that.

Fixes: 5e5e3a42 ("regulator: of: Add support for parsing initial and suspend modes")
Suggested-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 669ca030

drivers/regulator/cpcap-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static unsigned int cpcap_map_mode(unsigned int mode) 
	case CPCAP_BIT_AUDIO_LOW_PWR:

		return REGULATOR_MODE_STANDBY;

	default:

		return -EINVAL;

		return REGULATOR_MODE_INVALID;

	}

}

drivers/regulator/of_regulator.c

+7 −6
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static void of_get_regulation_constraints(struct device_node *np, 
	struct regulation_constraints *constraints = &(*init_data)->constraints;

	struct regulator_state *suspend_state;

	struct device_node *suspend_np;

	unsigned int mode;

	int ret, i;

	u32 pval;
@@ -124,11 +125,11 @@ static void of_get_regulation_constraints(struct device_node *np, 


	if (!of_property_read_u32(np, "regulator-initial-mode", &pval)) {

		if (desc && desc->of_map_mode) {

			ret = desc->of_map_mode(pval);

			if (ret == -EINVAL)

			mode = desc->of_map_mode(pval);

			if (mode == REGULATOR_MODE_INVALID)

				pr_err("%s: invalid mode %u\n", np->name, pval);

			else

				constraints->initial_mode = ret;

				constraints->initial_mode = mode;

		} else {

			pr_warn("%s: mapping for mode %d not defined\n",

				np->name, pval);
@@ -163,12 +164,12 @@ static void of_get_regulation_constraints(struct device_node *np, 
		if (!of_property_read_u32(suspend_np, "regulator-mode",

					  &pval)) {

			if (desc && desc->of_map_mode) {

				ret = desc->of_map_mode(pval);

				if (ret == -EINVAL)

				mode = desc->of_map_mode(pval);

				if (mode == REGULATOR_MODE_INVALID)

					pr_err("%s: invalid mode %u\n",

					       np->name, pval);

				else

					suspend_state->mode = ret;

					suspend_state->mode = mode;

			} else {

				pr_warn("%s: mapping for mode %d not defined\n",

					np->name, pval);

drivers/regulator/twl-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static inline unsigned int twl4030reg_map_mode(unsigned int mode) 
	case RES_STATE_SLEEP:

		return REGULATOR_MODE_STANDBY;

	default:

		return -EINVAL;

		return REGULATOR_MODE_INVALID;

	}

}

include/linux/regulator/consumer.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct regmap; 
 * These modes can be OR'ed together to make up a mask of valid register modes.

 */



#define REGULATOR_MODE_INVALID			0x0

#define REGULATOR_MODE_FAST			0x1

#define REGULATOR_MODE_NORMAL			0x2

#define REGULATOR_MODE_IDLE			0x4