From nobody Tue Apr 7 19:15:37 2026 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 AFF3B31E85D for ; Thu, 12 Mar 2026 08:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303639; cv=none; b=k2Ikju4uKnePegddHu+YUag5mZArWdk3YYPrryNTiAFpkCDuY0Dv/w/DKFBZpIrMi92YP7UQstPGM9HDp7c0oOXYbyBUGSoTi1NmezJiJQF4LMXApQWmIU7vWq0yugWAuS7huaIUX6zTu+qmfWZGH2jXlkmY/UIsPN6GqbWj00w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303639; c=relaxed/simple; bh=KBL2KAHrydV/D79+7VJo4kt+VPO0aydUCdNVSju3OPQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NikR4rJ/4g79PCw55lnUf0EbOTh2ow8K9HAh2dXtTHw+X74g86cws3pYLZ6GOh7ysY5R+ZzAK39h7PVaVtr7vXTl1uwV3Ts4SDSpnI0w7tlBlWnbFW+U4reaYHVXZffOsaU2HvG4u+9BrIjVJLWeLVZOuFglGx+TylxjbSJqufs= 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=MHLUB6Na; arc=none smtp.client-ip=209.85.215.175 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="MHLUB6Na" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-c73c990a9cdso246054a12.3 for ; Thu, 12 Mar 2026 01:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773303637; x=1773908437; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Yns/Hh4dMhlD/GzsEPl3R4E74c6TjlD5Sw6wnI8YU3M=; b=MHLUB6Naq0DM71/rY9hCvhJZ6CmT1M0zg7mPERIouTtomzJxg2wZ7d/vY2cnjH/UDy y8sgUv5kSfGFVv9GvVjMG2HCFrMu5wCZt7PtagFrSXuKx9MgMXztPwDpG0b2aCqz1QBB ckdQWD9O3fO/OVHe6PN4o8Zq91KVTow8J0gO0dq+C3HZrD0HyAsgQIoUYYXtimDJ0rx/ hQJfdBohp43VKAsKsMsri0wBII5Ew63sresZIUc8ZCOVSidSrsJUv6hY7nXOYap4QBKZ TrKsHlOQKLtJpVcem1YmiuaxppPQ/wPd6hboTB86eclsFG55ENd0WhS2ClPBUZC5uCiL ayeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773303637; x=1773908437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Yns/Hh4dMhlD/GzsEPl3R4E74c6TjlD5Sw6wnI8YU3M=; b=RcnrQm41e9OoaSzFG0K9+vEw/BLkM/kHiEsdA82ogtSgOkz/oWYzny/q1/tRqKl5ov 7w34mflKVgVe6FOAfGHWv3lfy19AyLPiifZl5Da1GNNPofUykI+Z0Am2aFar3uYWjEE1 nSlKSwf+TZd+UI1+pHWLjRDx4vcVRwWiGYuCoaoIXuCjgWO4h6pfdP+QANoMNuXxcpMI 4mxuD5Vs6DOxVOywbiZbo4p7eqra2wVYFfUOBR9LmHDxBB/nEOQqHcMsd9RKpyAxL0uQ 0sKcODLmTDx43+sMDEUpbkd0Y0tVp2D4OBHsnbZKAB7jWtyS+Mid7PXCxUXzMuVJ1oJ7 Ty3A== X-Forwarded-Encrypted: i=1; AJvYcCUhHF8jzS7xHpE2nVoWz69nuu0FPSBRxM8a2oXA5rVTABF+/oDOsMLX8Shijt7ZlX86rCANrhasUraE8lY=@vger.kernel.org X-Gm-Message-State: AOJu0YxN1gcIcCO6toPWiWOe8r7N3z95OW9d0A8NYuuzLrsJ8wDzZd56 yImnCOGN8lIu7gZigXfcx6kas1Kmf0G0L0r5NvCyop9sKuKXn2rrDDSg X-Gm-Gg: ATEYQzx02aU0Md3siAF4qOvBrmMy4pIzLCmo05/Nd//hIwgtqsgpM6ujE767LnzqKDF YXppe6s+4BaeeLDgzWJd3OZM10P3osmy7u/RZocDS6dn5yyKJcZBudZZbPlhndZfbCyX2g1vxZn +trB4DEA607tqERDnixfp7EpellcAbIkdX8VUIBfd46qEjp/kF8ZR/bO6gdG6uC6K9dJlQ97A4N 9kEGDLIHFVde08nJtrUarHjWgYsxTy2HLUpA2nMfFYnGnHPPtwvor6qMiIyj3tXG8drKG6C9369 PfTrp+UBd+LE4RS9kPGwLysTcxvWhQNFuA4VLP+/0MkQyfWFTSbd6EApAVBrPniDsRNzMLnaAS+ g0EwDwLMwpcYlOAWAZHDKlhZpKYdPQ3RubXGcsZj5OpZhvfu7OQu1rhC6mKvXdroX8l4y92344S X67KuUaB8aJZgzGPrmvwbDNZomWbidUHpdjoSYyMzVNuD6WWcqF3kWrWnPJEqJuJwsRAPThT1P2 f0b50VMNOd4wCMx4NGGntcPnQwRKNfszg== X-Received: by 2002:a17:903:2412:b0:2ae:4aa6:dc1a with SMTP id d9443c01a7336-2aeae8dc06amr52879765ad.42.1773303637035; Thu, 12 Mar 2026 01:20:37 -0700 (PDT) Received: from fedora ([103.92.106.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae24a91dsm64388905ad.31.2026.03.12.01.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:20:36 -0700 (PDT) From: Rajveer Chaudhari To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, waqar.hameed@axis.com, linusw@kernel.org, sakari.ailus@linux.intel.com, harshit.m.mogalapalli@oracle.com, antoniu.miclaus@analog.com, andrew.ijano@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Rajveer Chaudhari Subject: [PATCH v3 4/4] iio: accel: sca3000: convert to guard(mutex) Date: Thu, 12 Mar 2026 13:49:42 +0530 Message-ID: <20260312081942.23858-5-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312081942.23858-1-rajveer.chaudhari.linux@gmail.com> References: <20260312081942.23858-1-rajveer.chaudhari.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace manual mutex_lock/mutex_unlock pair with guard(mutex) in sca3000_print_rev(), sca3000_ring_int_process(), sca3000_read_event_config(), __sca3000_hw_ring_state_set(), sca3000_hw_ring_preenable(), sca3000_hw_ring_postdisable(), sca3000_clean_setup(), sca3000_stop_all_interrupts(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v3: Fixed return statements to make it clear about good/error path. Removed Not necessary return statement in sca3000_read_event_config(). Dropped else statement to reduce indent of the code in sca3000_read_event_config. Fixed indentation. v2: Dropped Header alignment change --- drivers/iio/accel/sca3000.c | 139 ++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 79 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index 4a827be439a2..2586a72d36aa 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -9,6 +9,7 @@ =20 #include #include +#include #include #include #include @@ -424,18 +425,18 @@ static int sca3000_print_rev(struct iio_dev *indio_de= v) int ret; struct sca3000_state *st =3D iio_priv(indio_dev); =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); + ret =3D sca3000_read_data_short(st, SCA3000_REG_REVID_ADDR, 1); if (ret < 0) - goto error_ret; + return ret; + dev_info(&indio_dev->dev, "sca3000 revision major=3D%lu, minor=3D%lu\n", st->rx[0] & SCA3000_REG_REVID_MAJOR_MASK, st->rx[0] & SCA3000_REG_REVID_MINOR_MASK); -error_ret: - mutex_unlock(&st->lock); =20 - return ret; + return 0; } =20 static ssize_t @@ -996,13 +997,14 @@ static void sca3000_ring_int_process(u8 val, struct i= io_dev *indio_dev) struct sca3000_state *st =3D iio_priv(indio_dev); int ret, i, num_available; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 if (val & SCA3000_REG_INT_STATUS_HALF) { ret =3D sca3000_read_data_short(st, SCA3000_REG_BUF_COUNT_ADDR, 1); if (ret) - goto error_ret; + return; + num_available =3D st->rx[0]; /* * num_available is the total number of samples available @@ -1011,7 +1013,8 @@ static void sca3000_ring_int_process(u8 val, struct i= io_dev *indio_dev) ret =3D sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, st->rx, num_available * 2); if (ret) - goto error_ret; + return; + for (i =3D 0; i < num_available / 3; i++) { /* * Dirty hack to cover for 11 bit in fifo, 13 bit @@ -1023,8 +1026,6 @@ static void sca3000_ring_int_process(u8 val, struct i= io_dev *indio_dev) iio_push_to_buffers(indio_dev, st->rx + i * 3 * 2); } } -error_ret: - mutex_unlock(&st->lock); } =20 /** @@ -1110,16 +1111,15 @@ static int sca3000_read_event_config(struct iio_dev= *indio_dev, struct sca3000_state *st =3D iio_priv(indio_dev); int ret; /* read current value of mode register */ - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); if (ret) - goto error_ret; + return ret; =20 switch (chan->channel2) { case IIO_MOD_X_AND_Y_AND_Z: - ret =3D !!(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT); - break; + return !!(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT); case IIO_MOD_X: case IIO_MOD_Y: case IIO_MOD_Z: @@ -1129,24 +1129,18 @@ static int sca3000_read_event_config(struct iio_dev= *indio_dev, */ if ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK) !=3D SCA3000_REG_MODE_MEAS_MODE_MOT_DET) { - ret =3D 0; - } else { - ret =3D sca3000_read_ctrl_reg(st, - SCA3000_REG_CTRL_SEL_MD_CTRL); - if (ret < 0) - goto error_ret; - /* only supporting logical or's for now */ - ret =3D !!(ret & sca3000_addresses[chan->address][2]); + return 0; } - break; + + ret =3D sca3000_read_ctrl_reg(st, + SCA3000_REG_CTRL_SEL_MD_CTRL); + if (ret < 0) + return ret; + /* only supporting logical or's for now */ + return !!(ret & sca3000_addresses[chan->address][2]); default: - ret =3D -EINVAL; + return -EINVAL; } - -error_ret: - mutex_unlock(&st->lock); - - return ret; } =20 static int sca3000_freefall_set_state(struct iio_dev *indio_dev, bool stat= e) @@ -1277,23 +1271,21 @@ int __sca3000_hw_ring_state_set(struct iio_dev *ind= io_dev, bool state) struct sca3000_state *st =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); + ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); if (ret) - goto error_ret; + return ret; + if (state) { dev_info(&indio_dev->dev, "supposedly enabling ring buffer\n"); - ret =3D sca3000_write_reg(st, + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, (st->rx[0] | SCA3000_REG_MODE_RING_BUF_ENABLE)); } else - ret =3D sca3000_write_reg(st, + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, (st->rx[0] & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); -error_ret: - mutex_unlock(&st->lock); - - return ret; } =20 /** @@ -1310,26 +1302,20 @@ static int sca3000_hw_ring_preenable(struct iio_dev= *indio_dev) int ret; struct sca3000_state *st =3D iio_priv(indio_dev); =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 /* Enable the 50% full interrupt */ ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); if (ret) - goto error_unlock; + return ret; + ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, st->rx[0] | SCA3000_REG_INT_MASK_RING_HALF); if (ret) - goto error_unlock; - - mutex_unlock(&st->lock); + return ret; =20 return __sca3000_hw_ring_state_set(indio_dev, 1); - -error_unlock: - mutex_unlock(&st->lock); - - return ret; } =20 static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev) @@ -1342,17 +1328,15 @@ static int sca3000_hw_ring_postdisable(struct iio_d= ev *indio_dev) return ret; =20 /* Disable the 50% full interrupt */ - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); if (ret) - goto unlock; - ret =3D sca3000_write_reg(st, - SCA3000_REG_INT_MASK_ADDR, - st->rx[0] & ~SCA3000_REG_INT_MASK_RING_HALF); -unlock: - mutex_unlock(&st->lock); - return ret; + return ret; + + return sca3000_write_reg(st, + SCA3000_REG_INT_MASK_ADDR, + st->rx[0] & ~SCA3000_REG_INT_MASK_RING_HALF); } =20 static const struct iio_buffer_setup_ops sca3000_ring_setup_ops =3D { @@ -1372,25 +1356,26 @@ static int sca3000_clean_setup(struct sca3000_state= *st) { int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); + /* Ensure all interrupts have been acknowledged */ ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_STATUS_ADDR, 1); if (ret) - goto error_ret; + return ret; =20 /* Turn off all motion detection channels */ ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL); if (ret < 0) - goto error_ret; + return ret; ret =3D sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL, ret & SCA3000_MD_CTRL_PROT_MASK); if (ret) - goto error_ret; + return ret; =20 /* Disable ring buffer */ ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL); if (ret < 0) - goto error_ret; + return ret; ret =3D sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL, (ret & SCA3000_REG_OUT_CTRL_PROT_MASK) | SCA3000_REG_OUT_CTRL_BUF_X_EN @@ -1398,17 +1383,17 @@ static int sca3000_clean_setup(struct sca3000_state= *st) | SCA3000_REG_OUT_CTRL_BUF_Z_EN | SCA3000_REG_OUT_CTRL_BUF_DIV_4); if (ret) - goto error_ret; + return ret; /* Enable interrupts, relevant to mode and set up as active low */ ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); if (ret) - goto error_ret; + return ret; ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, (ret & SCA3000_REG_INT_MASK_PROT_MASK) | SCA3000_REG_INT_MASK_ACTIVE_LOW); if (ret) - goto error_ret; + return ret; /* * Select normal measurement mode, free fall off, ring off * Ring in 12 bit mode - it is fine to overwrite reserved bits 3,5 @@ -1416,13 +1401,10 @@ static int sca3000_clean_setup(struct sca3000_state= *st) */ ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); if (ret) - goto error_ret; - ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - (st->rx[0] & SCA3000_MODE_PROT_MASK)); + return ret; =20 -error_ret: - mutex_unlock(&st->lock); - return ret; + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, + (st->rx[0] & SCA3000_MODE_PROT_MASK)); } =20 static const struct iio_info sca3000_info =3D { @@ -1504,18 +1486,17 @@ static int sca3000_stop_all_interrupts(struct sca30= 00_state *st) { int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); + ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); if (ret) - goto error_ret; - ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, - (st->rx[0] & - ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER | - SCA3000_REG_INT_MASK_RING_HALF | - SCA3000_REG_INT_MASK_ALL_INTS))); -error_ret: - mutex_unlock(&st->lock); - return ret; + return ret; + + return sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, + (st->rx[0] & + ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER | + SCA3000_REG_INT_MASK_RING_HALF | + SCA3000_REG_INT_MASK_ALL_INTS))); } =20 static void sca3000_remove(struct spi_device *spi) --=20 2.53.0