From nobody Thu Apr 2 12:12:06 2026 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 D85D130FC21 for ; Sun, 29 Mar 2026 22:47:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774824435; cv=none; b=DFGNeVjgvlFYj2+2XrZeJHcurg3Cx/0wWCmvfqTDeoKhgxyLtJHWUHLhbFfJ/3iEMBn7ZNjknO5PEElLZ+SXwdP94MafYQ8dxjj6fE2y97iohJR2ZAWuB+aavwxUoiQxZBfNVB4tjwpmUccbOUnWJyV3yAHn7h3fkOYzhYh7rU8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774824435; c=relaxed/simple; bh=xIe8W+1jIXINgmxwa9p/U0LcjRjeCYfnSgMBa9JCf9s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oJKR5VgKrDQ5XnzQgn0+PGQNQUAgwfLTSuDAvxRuDZ/CVKLqaxu6EGvtKw80yGT0zGJHuf2AH0m2SBad8Zsbk/xVfnylZAlX1MRcs6RerRznfRWfeeP1SP7TeTi+tqR1D7gWyydMFU8d8NQ6BWAVVktCfAcY7SxNmBC6VTdsHy4= 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=pgjaB1Ku; arc=none smtp.client-ip=74.125.82.182 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="pgjaB1Ku" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-2c56aa62931so467035eec.0 for ; Sun, 29 Mar 2026 15:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774824433; x=1775429233; 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=+vjudEEXqzxPRbybQTwtbPdouiJ0uhGQsqsaFK6mvh4=; b=pgjaB1KuyntZIlWVUj4gkhYhItg5ID7LnV7IN+zlMzTuT5k7K0X2b64ipOwahkRfQu Uys5MpawM0bA+SEdkOgt34sDbT7X4FUoczU7DiqN0kwPBZwV78HD7JqZcVEcUmYYkbw9 K9Ngu5jNsgdm7IDMN9XoflcC74cFiQ7TWvqaYLwS9+N/SazV/yJkVARRhs9ig9f+NwJ1 bhqpQJz09ikLGygGo7MxUQNryGSWbHC7nDNhK1v95htuvRPK7EJOv/oEI3sH+u1Tfrhw XFtd51vQUtpdiSb8/hxdaBlzlIde8P/W/uC5klvzcNcLhMpAwcit6I8iq9cSvTDyALoF Kveg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774824433; x=1775429233; 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=+vjudEEXqzxPRbybQTwtbPdouiJ0uhGQsqsaFK6mvh4=; b=ESiHZyiDkM33QpOXgb4lul5dWf6x0YnmySK5OJX64a3lvVqTvBsG83e4oW+SN+0hY4 EqXUM9FHqOHLLwlxwiSeZ8ux2WFAG4tJ2+RD4RRt5DXXI6emq/lFSm4z+sUqvJg+kkCz Jg8qqviFE7OzYCOZrkkjjxDxA+tcV8RN/iS/+b39ACXkK8nU6cUdZqN41pXOhxrz7bDe 4K3Ev1AJw7nLkDO8brCPThbELJCV8milhFz5Mqa48xYRc9xCw9Q/xEvdG9uUoZK696wT hiHuABskygvpHk7N/N1iNjxXukuHi9kg95QNJARwec4ngmHPKgNmiwDKwDqzaLIs0Vn4 J1Bg== X-Forwarded-Encrypted: i=1; AJvYcCX9rn7zzob2el/fDxmfDN+3ttIdMa44AbjxySvuwuBwOfA354IZ0trgvfN68uVdJOdLSSqiXBanMyrw5JA=@vger.kernel.org X-Gm-Message-State: AOJu0YzqR9GtPc+CZb9m7TaFasCtCKXYaSA5fD7suE+ytQrOEnwU9Fvm h7tecjV8LNTVcGdhN8ndtFC/8AzYoBWfdra2eBpaOt+S9fFoC1WFlSAh X-Gm-Gg: ATEYQzxR75SHOYw++h1aWdrDfUYeF8uKA3UJ08fq19JlnSskToUpyf8RT+Gfw9UdTbf +wcVBbfE1pfGTLMyyLg337977rWYPxS8X5AJTV6lo7EZuUYsTGWifirv+xEagxO33SK/MINVod+ Gp9jBjXYYudreo+0wqxS7NxfrR2RkGEgAJqsplLqQ13cC47CK8QN6lIeF2RWISQ4dpns8QkqaKd j6aEeXloKstsl3ftFfxLzdw0UTlVscTWgGEibGUxZtHDa5lJkB9VJkvFxa0tobKcKxzBPN+2G74 JvhD+kuXfWL8y/WeXUWQF7cwFI+7lfhBZiAjRftrLL5LiNn73FQD+7gKHuO5pvXDgd4XxtBldfZ zRK9XVQPdiYEWJQJMu8roB0Zyfx8v8i7qNMDLw5ZdjkOtaF5Gn29/6bbZ/rsk0bg3YOG0hv6wWM alSbT6hi7pGEVvIEvdQDdYRX+e1mS8/OdZOBvET7mkvNeZD2Vp+ePfvQIJyhtrR46lhSDitnhjo nlRtuylhIF8qm4= X-Received: by 2002:a05:7301:3d19:b0:2ba:7875:10c9 with SMTP id 5a478bee46e88-2c185e4da2dmr5231209eec.26.1774824433027; Sun, 29 Mar 2026 15:47:13 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:7265:773a:8e51:c62f]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c3c7971d97sm5840295eec.30.2026.03.29.15.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2026 15:47:12 -0700 (PDT) From: Dmitry Torokhov Date: Sun, 29 Mar 2026 15:47:06 -0700 Subject: [PATCH v4 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: <20260329-ti-ads7950-facelift-v4-1-c568c508c49a@gmail.com> References: <20260329-ti-ads7950-facelift-v4-0-c568c508c49a@gmail.com> In-Reply-To: <20260329-ti-ads7950-facelift-v4-0-c568c508c49a@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 X-Mailer: b4 0.15-dev-a6826 guard() notation allows early returns when encountering errors, making control flow more obvious. Use it. Reviewed-by: David Lechner Signed-off-by: Dmitry Torokhov Reviewed-by: Bartosz Golaszewski --- 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.1018.g2bb0e51243-goog