Commit e2c58cbe authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Walleij
Browse files

pinctrl: rockchip: Simplify locking with scoped_guard() 



Simplify error handling by removing two mutex_unlock() calls with
scoped_guard().

Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: default avatarLinus Walleij <linusw@kernel.org>
parent 160d686f

drivers/pinctrl/pinctrl-rockchip.c

+9 −10
Original line number Diff line number Diff line
@@ -3640,17 +3640,16 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, 
			 * The lock makes sure that either gpio-probe has completed

			 * or the gpio driver hasn't probed yet.

			 */

			mutex_lock(&bank->deferred_lock);

			scoped_guard(mutex, &bank->deferred_lock) {

				if (!gpio || !gpio->direction_output) {

				rc = rockchip_pinconf_defer_pin(bank, pin - bank->pin_base, param,

								arg);

				mutex_unlock(&bank->deferred_lock);

					rc = rockchip_pinconf_defer_pin(bank,

									pin - bank->pin_base,

									param, arg);

					if (rc)

						return rc;



					break;

				}

			mutex_unlock(&bank->deferred_lock);

			}

		}



		switch (param) {