From nobody Mon Apr 6 14:57:25 2026 Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34E7232779D for ; Mon, 6 Apr 2026 04:39:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775450372; cv=none; b=C/BFARtRsmQXFnmCpfDFFUgm3RPxCEO4wlqo/PEhruxRpFhZQqKeyHsDdLXC729XTlm4tP8F9b4uYP0m30IF2Um2trl0d053QDqlamIuMY9ofyjYdnrM5dVKPr++u5CIiq1LZdbFRTrK/sX4afmUwsh5UZ4hwPTAMp4FBM6VAaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775450372; c=relaxed/simple; bh=Jp11lnnBrydu78xWpI7iQkASv1g6UtX/tycmB5OGwuo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r7NSomK3tIddcYvyOq2JhYD7ZC6VO/+Sh8v/y3zXDrV8XGcIxBf6crp0QQSjycjckR9+UnP9qHn07jVZDhNn36YFaZ6H2PvzXJlnAON8PFsjx4TxuPV3YowUBIfmY0i6IyI/Lst0RmxcqwcLOCdV8PhQeg4xvMbDoHiaf26hjjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LGv3t+uy; arc=none smtp.client-ip=74.125.82.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LGv3t+uy" Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-12776bebe9fso8410504c88.1 for ; Sun, 05 Apr 2026 21:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775450370; x=1776055170; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bm4XXEcWjidns3Evs84tEMwqC2yXbhhjm6W1vqULni0=; b=LGv3t+uykzFn4AzECoZMV3TV+6IDSpFEr9A5rcl5TmCYxvMQ4GWOvDqbqkWEnQs99w WdVxwcTRyTvtsieQ7vasOOqDKuqwL8vO++Zgmjv96jli/meVRsuY/lGhWwGb0mQiMJd2 5VCyEu5VS+DfzYriXJeIxmrGFLfeWQ0LWm7cxtMZOF4nxQTZkbnBNhfmiyaFHCeOt0LE Ox0RSQkMc6otHc59ztM4dFpEaHfbQ4cKQGFTRl21fpeNsOmldRe1JyWI9v+rT0vWr6lu BtzlqOZsnCJoD/RxpWbfrwkx34EcNWc2r+D3S35ImPasbfZDVLPSn6/Pvi7Qxjm5MqMM 7UBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775450370; x=1776055170; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=bm4XXEcWjidns3Evs84tEMwqC2yXbhhjm6W1vqULni0=; b=rnTzk+AM2mptZM0RSHU1QiN5V2+oBHJK2YKBEK2WM8wwL1VcXewgJvVY9zZWXjVb05 TweFuqATxj27uAEYOhq7cYa2LKywRSS2J6IDg7chi0knkENRFUjYaPye1LhlZsSJl9Uk 7/Htnvlr3aZGr41iuXm77l7NO0hhNzYYk8tqKBgVv1x1jarP94PayBrba5DpIfSMFv9x 6ARo90Zw7IKOuV8/p5LwTOpDLrTmoqyK/RLy7Dl5tLaQT6SGjAG7yl8GC+Bbmk5jvGFT DB/KOoKUT2iwgZLGI/h1srwV7k2VuMyTjCt6kNjZBixgYu6IDHSIt1OLSWFFtrwpG+0u R3gQ== X-Forwarded-Encrypted: i=1; AJvYcCXcHG1ACafDlR0qfTNuVqkIDRIAdi5lzEZFIQTBzYtnh2DnNc/YOefezewLtoZ+qm9BNYNQ8v8V9VeKMX4=@vger.kernel.org X-Gm-Message-State: AOJu0YyI14q9hRpMCjAN19qz0GNpRcMGRr7rfqGpOohH0cvi8R29QuJ+ hNrdut1yZJGxCEcaWA4FHA4shHqi16m8SRxmBMIGQEEoTR9A54zl8QNH X-Gm-Gg: AeBDievd9MSOV5IUmiqsk2R3kNDBFv+AQz3v4dJDHOCC01gaLcwHSr2Y/cuuiTbR8vS LdYWKy8Xxt1eNVePV4BW61R8bPZ0jwYe3WEur6QFa9nl68H2bpJJJQFUnPiXegMCwf1Ta++zEir a1v5pVxrIeDpeBDRD4EGgC+CuYjuGocUHlYVXWMvPcuk50nlpvTnRAnSfCmkhgw5V7x4msV6ehp bVWbWVJPW45n6yTqiVm12RxVVfl6foSvNml/7BPu1+mGvR3K1HcBEXb0pWleNVFUJy4wMgKR2V+ 9OwyYW8LQs9oq2iXMlso+CWN4c3wRT3iaxKVF+p4pj/3THoQVb7JLNhNX9hN1cT9sfElJmEH/0E eiuwH3B7TYl1/jgdnCPUBcDIYqyNujULgqgDiEsnVRMF3WE/At1dRuIpE/Vq/gFVCMOfIdfRyDX BNs7din6ij1jmMdwM8M21alDVy3g94TDL4wgsH7Qy2FDMOFDI8FMSj3DSDVk3fYnWc+6qIHq3qP B5/eTxJsqHz4QM= X-Received: by 2002:a05:7022:6092:b0:128:cbc7:4c28 with SMTP id a92af1059eb24-12bfb771ab5mr5387632c88.35.1775450370259; Sun, 05 Apr 2026 21:39:30 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:fe13:98b9:9e98:d1bb]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm15182005c88.0.2026.04.05.21.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2026 21:39:29 -0700 (PDT) From: Dmitry Torokhov Date: Sun, 05 Apr 2026 21:39:23 -0700 Subject: [PATCH v5 1/4] iio: adc: ti-ads7950: switch to using guard() notation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260405-ti-ads7950-facelift-v5-1-1f980ed3cf9e@gmail.com> References: <20260405-ti-ads7950-facelift-v5-0-1f980ed3cf9e@gmail.com> In-Reply-To: <20260405-ti-ads7950-facelift-v5-0-1f980ed3cf9e@gmail.com> To: Jonathan Cameron , David Lechner Cc: =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Jonathan Cameron , Bartosz Golaszewski X-Mailer: b4 0.16-dev-6911d guard() notation allows early returns when encountering errors, making control flow more obvious. Use it. Reviewed-by: David Lechner Reviewed-by: Bartosz Golaszewski Signed-off-by: Dmitry Torokhov --- drivers/iio/adc/ti-ads7950.c | 83 +++++++++++++++++-----------------------= ---- 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c index 028acd42741f..6e9ea9cc33bf 100644 --- a/drivers/iio/adc/ti-ads7950.c +++ b/drivers/iio/adc/ti-ads7950.c @@ -299,18 +299,19 @@ static irqreturn_t ti_ads7950_trigger_handler(int irq= , void *p) struct ti_ads7950_state *st =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&st->slock); - ret =3D spi_sync(st->spi, &st->ring_msg); - if (ret < 0) - goto out; - - iio_push_to_buffers_with_ts_unaligned(indio_dev, &st->rx_buf[2], - sizeof(*st->rx_buf) * - TI_ADS7950_MAX_CHAN, - iio_get_time_ns(indio_dev)); - -out: - mutex_unlock(&st->slock); + do { + guard(mutex)(&st->slock); + + ret =3D spi_sync(st->spi, &st->ring_msg); + if (ret) + break; + + iio_push_to_buffers_with_ts_unaligned(indio_dev, &st->rx_buf[2], + sizeof(*st->rx_buf) * + TI_ADS7950_MAX_CHAN, + iio_get_time_ns(indio_dev)); + } while (0); + iio_trigger_notify_done(indio_dev->trig); =20 return IRQ_HANDLED; @@ -321,20 +322,16 @@ static int ti_ads7950_scan_direct(struct iio_dev *ind= io_dev, unsigned int ch) struct ti_ads7950_state *st =3D iio_priv(indio_dev); int ret, cmd; =20 - mutex_lock(&st->slock); + guard(mutex)(&st->slock); + cmd =3D TI_ADS7950_MAN_CMD(TI_ADS7950_CR_CHAN(ch)); st->single_tx =3D cmd; =20 ret =3D spi_sync(st->spi, &st->scan_single_msg); if (ret) - goto out; - - ret =3D st->single_rx; - -out: - mutex_unlock(&st->slock); + return ret; =20 - return ret; + return st->single_rx; } =20 static int ti_ads7950_get_range(struct ti_ads7950_state *st) @@ -400,9 +397,8 @@ static int ti_ads7950_set(struct gpio_chip *chip, unsig= ned int offset, int value) { struct ti_ads7950_state *st =3D gpiochip_get_data(chip); - int ret; =20 - mutex_lock(&st->slock); + guard(mutex)(&st->slock); =20 if (value) st->cmd_settings_bitmask |=3D BIT(offset); @@ -410,11 +406,8 @@ static int ti_ads7950_set(struct gpio_chip *chip, unsi= gned int offset, st->cmd_settings_bitmask &=3D ~BIT(offset); =20 st->single_tx =3D TI_ADS7950_MAN_CMD_SETTINGS(st); - ret =3D spi_sync(st->spi, &st->scan_single_msg); - - mutex_unlock(&st->slock); =20 - return ret; + return spi_sync(st->spi, &st->scan_single_msg); } =20 static int ti_ads7950_get(struct gpio_chip *chip, unsigned int offset) @@ -423,13 +416,12 @@ static int ti_ads7950_get(struct gpio_chip *chip, uns= igned int offset) bool state; int ret; =20 - mutex_lock(&st->slock); + guard(mutex)(&st->slock); =20 /* If set as output, return the output */ if (st->gpio_cmd_settings_bitmask & BIT(offset)) { state =3D st->cmd_settings_bitmask & BIT(offset); - ret =3D 0; - goto out; + return state; } =20 /* GPIO data bit sets SDO bits 12-15 to GPIO input */ @@ -437,7 +429,7 @@ static int ti_ads7950_get(struct gpio_chip *chip, unsig= ned int offset) st->single_tx =3D TI_ADS7950_MAN_CMD_SETTINGS(st); ret =3D spi_sync(st->spi, &st->scan_single_msg); if (ret) - goto out; + return ret; =20 state =3D (st->single_rx >> 12) & BIT(offset); =20 @@ -446,12 +438,9 @@ static int ti_ads7950_get(struct gpio_chip *chip, unsi= gned int offset) st->single_tx =3D TI_ADS7950_MAN_CMD_SETTINGS(st); ret =3D spi_sync(st->spi, &st->scan_single_msg); if (ret) - goto out; - -out: - mutex_unlock(&st->slock); + return ret; =20 - return ret ?: state; + return state; } =20 static int ti_ads7950_get_direction(struct gpio_chip *chip, @@ -467,9 +456,8 @@ static int _ti_ads7950_set_direction(struct gpio_chip *= chip, int offset, int input) { struct ti_ads7950_state *st =3D gpiochip_get_data(chip); - int ret =3D 0; =20 - mutex_lock(&st->slock); + guard(mutex)(&st->slock); =20 /* Only change direction if needed */ if (input && (st->gpio_cmd_settings_bitmask & BIT(offset))) @@ -477,15 +465,11 @@ static int _ti_ads7950_set_direction(struct gpio_chip= *chip, int offset, else if (!input && !(st->gpio_cmd_settings_bitmask & BIT(offset))) st->gpio_cmd_settings_bitmask |=3D BIT(offset); else - goto out; + return 0; =20 st->single_tx =3D TI_ADS7950_GPIO_CMD_SETTINGS(st); - ret =3D spi_sync(st->spi, &st->scan_single_msg); - -out: - mutex_unlock(&st->slock); =20 - return ret; + return spi_sync(st->spi, &st->scan_single_msg); } =20 static int ti_ads7950_direction_input(struct gpio_chip *chip, @@ -508,9 +492,9 @@ static int ti_ads7950_direction_output(struct gpio_chip= *chip, =20 static int ti_ads7950_init_hw(struct ti_ads7950_state *st) { - int ret =3D 0; + int ret; =20 - mutex_lock(&st->slock); + guard(mutex)(&st->slock); =20 /* Settings for Manual/Auto1/Auto2 commands */ /* Default to 5v ref */ @@ -518,17 +502,12 @@ static int ti_ads7950_init_hw(struct ti_ads7950_state= *st) st->single_tx =3D TI_ADS7950_MAN_CMD_SETTINGS(st); ret =3D spi_sync(st->spi, &st->scan_single_msg); if (ret) - goto out; + return ret; =20 /* Settings for GPIO command */ st->gpio_cmd_settings_bitmask =3D 0x0; st->single_tx =3D TI_ADS7950_GPIO_CMD_SETTINGS(st); - ret =3D spi_sync(st->spi, &st->scan_single_msg); - -out: - mutex_unlock(&st->slock); - - return ret; + return spi_sync(st->spi, &st->scan_single_msg); } =20 static int ti_ads7950_probe(struct spi_device *spi) --=20 2.53.0.1213.gd9a14994de-goog