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

Commit b1eb8fab authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Linus Walleij
Browse files

pinctrl: simplify check for pin request conflicts 



This is a non-functional change, which deletes code duplication in two
of four if-if branches by reordering the checks. Functional identity
of the code change can be shown by running through the whole truth table
of boolean arguments.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 55e40950

drivers/pinctrl/pinmux.c

+15 −28
Original line number Diff line number Diff line
@@ -99,37 +99,24 @@ static int pin_request(struct pinctrl_dev *pctldev, 
	dev_dbg(pctldev->dev, "request pin %d (%s) for %s\n",

		pin, desc->name, owner);



	if (gpio_range) {

		/* There's no need to support multiple GPIO requests */

		if (desc->gpio_owner) {

			dev_err(pctldev->dev,

				"pin %s already requested by %s; cannot claim for %s\n",

				desc->name, desc->gpio_owner, owner);

			goto out;

		}

		if (ops->strict && desc->mux_usecount &&

		    strcmp(desc->mux_owner, owner)) {

	if ((!gpio_range || ops->strict) &&

	    desc->mux_usecount && strcmp(desc->mux_owner, owner)) {

		dev_err(pctldev->dev,

			"pin %s already requested by %s; cannot claim for %s\n",

			desc->name, desc->mux_owner, owner);

		goto out;

	}



		desc->gpio_owner = owner;

	} else {

		if (desc->mux_usecount && strcmp(desc->mux_owner, owner)) {

			dev_err(pctldev->dev,

				"pin %s already requested by %s; cannot claim for %s\n",

				desc->name, desc->mux_owner, owner);

			goto out;

		}

		if (ops->strict && desc->gpio_owner) {

	if ((gpio_range || ops->strict) && desc->gpio_owner) {

		dev_err(pctldev->dev,

			"pin %s already requested by %s; cannot claim for %s\n",

			desc->name, desc->gpio_owner, owner);

		goto out;

	}



	if (gpio_range) {

		desc->gpio_owner = owner;

	} else {

		desc->mux_usecount++;

		if (desc->mux_usecount > 1)

			return 0;