From patchwork Wed Apr 9 21:12:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 879418 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC0C01DA61B; Wed, 9 Apr 2025 21:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744233173; cv=none; b=E+vaE2LFRHq6Tos/r0S0z4kw5VDGz6Y3QD81308Xneu9H9D1fIbnVifTUgWSt+9thfiBPRX4pfaHWXhSjmX6Vhurm8X8PrT3MlVJvOZuaT/aFDcevivMWrLCvDrJjYUc1uQ5tm1peUpNj5zVYauTXutAUHQ1y/qrAihn1PLY9a4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744233173; c=relaxed/simple; bh=YAShHKLj8AoioI4Y2oEJ64CG3mJHNjT9J6J+lcCikLs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=fc74SMtnm6P8RyDmoGbn7Yk1bSV9PKUjESnxYEHJcCjPCZRlKQGUF5yl8AhvymAVo/TRxC6n6BgHCqvRCGGIUErJzCX+dXUm5TLmjQgY8zA+R6TE13ewjXPOo7wTC1XAxRn/6OWMOKsNNoIMrQ0VrPpKa2BwsuAbL6ggnyU4uBQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sgsIZF9k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sgsIZF9k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6284C4CEE2; Wed, 9 Apr 2025 21:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744233173; bh=YAShHKLj8AoioI4Y2oEJ64CG3mJHNjT9J6J+lcCikLs=; h=From:To:Cc:Subject:Date:From; b=sgsIZF9k9MpBH1Hv6vfy3AZVYRa62mPjCja+kWjnM66kF7irll7p3r1e/PKZeQMQg bhppqt+hinZOK/yKnktSu54neTTQxfjCLOZgrWp3hhYJpPv/wnlNllq7IxcyxD9bky W5iSsifb+pSaYU5KQGOu6BvU2UXvKO4haSJu8eG0Lnh/D3ZHxakLPAvhHsl9H9YL3k DcvHMrccQ3iEarZFvWY3UibadziAEI/4i7jHCct91rB0/jbGL0eou3zec65HQ76o2J dw5Lg+MDjoJEiAuoLNCVRP53zLKr20ir54v6Hjjw8ppekVKUFvER7K1lINC3LRW4I+ zjOwXDB8fnOCw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Linus Walleij , Bartosz Golaszewski Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski , Arnd Bergmann , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH v2] platform: cznic: use new GPIO line value setter callbacks Date: Wed, 9 Apr 2025 23:12:43 +0200 Message-ID: <20250409211243.20105-1-kabel@kernel.org> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski struct gpio_chip now has callbacks for setting line values that return an integer, allowing to indicate failures. Convert the driver to using them. Signed-off-by: Bartosz Golaszewski Signed-off-by: Marek Behún --- Commit 98ce1eb1fd87e ("gpiolib: introduce gpio_chip setters that return values") added new line setter callbacks to struct gpio_chip. They allow to indicate failures to callers. We're in the process of converting all GPIO controllers to using them before removing the old ones. --- Changes since v1: - renamed the variable `ret` to `err` Arnd, I guess this can be merged by gpio subsystem maintainers. Marek --- .../platform/cznic/turris-omnia-mcu-gpio.c | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/platform/cznic/turris-omnia-mcu-gpio.c b/drivers/platform/cznic/turris-omnia-mcu-gpio.c index 5f35f7c5d5d7..dabdce113af2 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-gpio.c +++ b/drivers/platform/cznic/turris-omnia-mcu-gpio.c @@ -438,27 +438,28 @@ static int omnia_gpio_get_multiple(struct gpio_chip *gc, unsigned long *mask, return 0; } -static void omnia_gpio_set(struct gpio_chip *gc, unsigned int offset, int value) +static int omnia_gpio_set(struct gpio_chip *gc, unsigned int offset, int value) { const struct omnia_gpio *gpio = &omnia_gpios[offset]; struct omnia_mcu *mcu = gpiochip_get_data(gc); u16 val, mask; if (!gpio->ctl_cmd) - return; + return -EINVAL; mask = BIT(gpio->ctl_bit); val = value ? mask : 0; - omnia_ctl_cmd(mcu, gpio->ctl_cmd, val, mask); + return omnia_ctl_cmd(mcu, gpio->ctl_cmd, val, mask); } -static void omnia_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, - unsigned long *bits) +static int omnia_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, + unsigned long *bits) { unsigned long ctl = 0, ctl_mask = 0, ext_ctl = 0, ext_ctl_mask = 0; struct omnia_mcu *mcu = gpiochip_get_data(gc); unsigned int i; + int err; for_each_set_bit(i, mask, ARRAY_SIZE(omnia_gpios)) { unsigned long *field, *field_mask; @@ -487,13 +488,21 @@ static void omnia_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, guard(mutex)(&mcu->lock); - if (ctl_mask) - omnia_ctl_cmd_locked(mcu, OMNIA_CMD_GENERAL_CONTROL, - ctl, ctl_mask); + if (ctl_mask) { + err = omnia_ctl_cmd_locked(mcu, OMNIA_CMD_GENERAL_CONTROL, + ctl, ctl_mask); + if (err) + return err; + } + + if (ext_ctl_mask) { + err = omnia_ctl_cmd_locked(mcu, OMNIA_CMD_EXT_CONTROL, + ext_ctl, ext_ctl_mask); + if (err) + return err; + } - if (ext_ctl_mask) - omnia_ctl_cmd_locked(mcu, OMNIA_CMD_EXT_CONTROL, - ext_ctl, ext_ctl_mask); + return 0; } static bool omnia_gpio_available(struct omnia_mcu *mcu, @@ -1014,8 +1023,8 @@ int omnia_mcu_register_gpiochip(struct omnia_mcu *mcu) mcu->gc.direction_output = omnia_gpio_direction_output; mcu->gc.get = omnia_gpio_get; mcu->gc.get_multiple = omnia_gpio_get_multiple; - mcu->gc.set = omnia_gpio_set; - mcu->gc.set_multiple = omnia_gpio_set_multiple; + mcu->gc.set_rv = omnia_gpio_set; + mcu->gc.set_multiple_rv = omnia_gpio_set_multiple; mcu->gc.init_valid_mask = omnia_gpio_init_valid_mask; mcu->gc.can_sleep = true; mcu->gc.names = omnia_mcu_gpio_names;