From nobody Thu Apr 9 21:52:25 2026 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (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 B18823803E3 for ; Thu, 5 Mar 2026 19:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772738522; cv=none; b=iwZre1+XaRM1ZcTE/+f+KqaiprxdDXrWwChJQEQw5ZJOeIpEvyqvzp2oemBCA5dCKf5THBUuYgzImLagP7VJEwxgunRdv4H1GLp/uJ4NG78dZICFF8jT4tQgauJMbpQE+0Ci8Zac1nj4ThsbZsu6Dg+95qubZwjshTwU4WTIpq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772738522; c=relaxed/simple; bh=3SWnArpUdPvh7sURBFPMyY8lv0kCsfhAdKB/7fgwDT8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Qc5rpkSOTiTmm+CF2fA3QYj1nMFvpaT9i3scmInmnczgG9g7ERcrrp+XxGUg7/48QiZiLfxaXbbSmasPqzsa+ARKBSM6A+EgtfySDuBpXIp16XUSDS9o2OzPk/VpifMUXYidoSA98DJPudX2VbQjROyULRPEjw/W5TYzQJNy0Tw= 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=e9KcXdJm; arc=none smtp.client-ip=74.125.82.181 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="e9KcXdJm" Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2be1c918173so7179929eec.1 for ; Thu, 05 Mar 2026 11:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772738520; x=1773343320; 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=fRSHQ7gatZSUG3RtlqSDdsXge7aN0hna6nERoHcMWWI=; b=e9KcXdJmD95Na9Q6wV+O/tMphO4LEVfhZu6kYU3GrnJglzjoelJjBlmlG50kDZ3+EU jtDbyjwj9mvRWfJLv9fmYIrOesm7hvaQgSQgn+UxrUyj0JuwxbLbT8okGaTyWR2cCpjl DuvDcfZTBYs4bvV8sMNi/Crq6YlLawsR61CFNPfNFB8TxvOUVvmKkO/EC8bn2+vAQJNn EkK3+g8Uj/mnNvhE5cmn3hsKvZinweq4YGMC4N2wc7NtgMQUHI1Dsiy1UO3HL0zV/0qM MFDb+GL7yPxR+kQYSx+qjFRvgsN3jKBLKr5o1WGdRW3omxBzMhf5gCzW3u8Bs88x4YeR YufQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772738520; x=1773343320; 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=fRSHQ7gatZSUG3RtlqSDdsXge7aN0hna6nERoHcMWWI=; b=v7Y7dhIyjCJEyNYWyxDyUceVK53xe4Dj2N01nHpIXsu/pzX4iF7oEc48XQLkV9lxHJ /hoe8q9bIUDrXgNupyPU+VMDFxWmlcxD2Es/JD3JD1h2SftEG7OHTdVd9OD0DJR5jWEh g027U4806//XdSAONZbEE8J3sRFzZKQoOMV59gUnmY8CHXP+9o3nXTAClgMBqAmgJ6oR 6QpFcWg8iV6jU56Ql5ZowHOA9j2NaB1RcRhmICzeIZycO3VESsnPGXK4S/YF1zbCHQ59 Osz8E1ACJElZd64T+p3gRGO8l9+StuhxR7EHMPwDVARFK9Z5iRslFoVq9wOHsZPOw8LC M4HA== X-Forwarded-Encrypted: i=1; AJvYcCWO6vx3k9zEIq36WyEt66ytIqLpUpcXZoHoOJptVk1bBRYzPh+PU3X1sHHTs5cdzwJ5IhBpa5RSY2yQDNg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb5XUqOr+hGGZtBhe2FVerJO+XQhe5w08oG1you22inaSGgkdC FdKvDQbzvfQ4OBAgoWctVRGe6EjYgf1mMtTNijBBlYEoJcGbC/jg8Lc/ X-Gm-Gg: ATEYQzxW6fEn5bh7Xf5IQ4uE0DlJ4UE7jZvn4i9V9HeaPadyYOhk0Nd0owcNs2Bc6Zy /NgaCOe+I79TwQAx+T4Rde40ReFzCzngJOOIlMPNOdjCUZ/M4GgebgL1j0HTAlt/CU8CkudOQfz wygYxhN+x4uwAZ1WdBxhPtnO4dCTP/Qgq8Tu9W7UVjRp6l2ctjLAP6NScEQ+UlumM8eV7YgGMje PTSAHJWiS1lMUEeG61zD7zB+JSXXLkNlbcSU5uoDmupK+MOpKwOrrc8KkcoTxLGD8pfqzQ9+Z2d NkUZiE1eIwytlsQ2HmPgR0635TfonrzegVKLjKBIhKp+KojHz8eEVP5MyugK8v+0iKbCtJMsECT JBm6d7rBvdnqYBbDrA8rd8CbzLBOPeUDyXX3ILVi+TS0J34KfH6x9h4cWU6aS0KdqlGha9xWM2V GUxOOBQFhjM28jkHHhESQd5NW/2L3DG3yL/GjiZwUw7sFhDns1gezxwnCrBya3T7JYTn0jBKCbW p2gOPRuPuVLX8s= X-Received: by 2002:a05:7300:6c1f:b0:2ae:5ffa:8da4 with SMTP id 5a478bee46e88-2be30fbca17mr3113659eec.1.1772738519575; Thu, 05 Mar 2026 11:21:59 -0800 (PST) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:7788:d145:a740:ca06]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be1281ff70sm10800980eec.14.2026.03.05.11.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 11:21:59 -0800 (PST) From: Dmitry Torokhov Date: Thu, 05 Mar 2026 11:21:54 -0800 Subject: [PATCH v3 3/6] 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: <20260305-ti-ads7950-facelift-v3-3-a23fdd1a079e@gmail.com> References: <20260305-ti-ads7950-facelift-v3-0-a23fdd1a079e@gmail.com> In-Reply-To: <20260305-ti-ads7950-facelift-v3-0-a23fdd1a079e@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-94184 guard() notation allows early returns when encountering errors, making control flow more obvious. Use it. Signed-off-by: Dmitry Torokhov Reviewed-by: David Lechner --- drivers/iio/adc/ti-ads7950.c | 75 ++++++++++++++++------------------------= ---- 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c index cdc624889559..1515089dd759 100644 --- a/drivers/iio/adc/ti-ads7950.c +++ b/drivers/iio/adc/ti-ads7950.c @@ -308,16 +308,17 @@ 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; + do { + guard(mutex)(&st->slock); =20 - iio_push_to_buffers_with_timestamp(indio_dev, &st->rx_buf[2], - iio_get_time_ns(indio_dev)); + ret =3D spi_sync(st->spi, &st->ring_msg); + if (ret) + break; + + iio_push_to_buffers_with_timestamp(indio_dev, &st->rx_buf[2], + iio_get_time_ns(indio_dev)); + } while (0); =20 -out: - mutex_unlock(&st->slock); iio_trigger_notify_done(indio_dev->trig); =20 return IRQ_HANDLED; @@ -328,20 +329,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) @@ -407,9 +404,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); @@ -417,11 +413,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) @@ -430,13 +423,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 */ @@ -444,7 +436,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 @@ -453,12 +445,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, @@ -474,9 +463,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))) @@ -484,15 +472,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); =20 -out: - mutex_unlock(&st->slock); - - return ret; + return spi_sync(st->spi, &st->scan_single_msg); } =20 static int ti_ads7950_direction_input(struct gpio_chip *chip, @@ -515,9 +499,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 */ @@ -525,17 +509,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.473.g4a7958ca14-goog