From nobody Tue Apr 7 17:55:53 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 EA25F40DFDC for ; Thu, 12 Mar 2026 08:20:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303618; cv=none; b=laN6t1iy/h3LmlarRPXDhYoa7aYdoFGJbq7ijAww64vQelCek4ZBbGr6Fs8OYTDmpSOR1MhYj4LiioBymPvlN6XcuF/nORX8DgNjnkXTYfD/zhxgmWVyy0iRCZJcZhUACplAS9HORGcj56cftSwrPnQjRTUhz2btaekSBCtGJi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303618; c=relaxed/simple; bh=Edaye/3CrVze15FJxoamDG+w6ueaUaBhBylJlmgV0tY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WF75vxE1gjTmHHzNQ8/6YPeYR1wlhyya8DGG7Qtv4pD4Na8FUopPnfjO3UAqgOBNLv4FAF6mgEerMIObndBNgYnYv6z9egpzDDPvaKhc2hUJjekYHQRtNNi8IcHFt9Anf0009vedHFspym5B/+038R1Bw6IvGnjvAvlqyMQ20j4= 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=m5/gHJOH; arc=none smtp.client-ip=209.85.214.171 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="m5/gHJOH" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ae5636ab04so8450775ad.3 for ; Thu, 12 Mar 2026 01:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773303616; x=1773908416; 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=6Da6CmLvCiNOlwy1v5QAVRL0Kuj4W/ug/xDjVba+jfw=; b=m5/gHJOHfmffvTAOog2oXqR7DOCuOw6VqWukAoe0kbKIMAGi78S8p95D6S9Z/68mhH +vWSN7lI3n4lgYFjqD1STMGxfjoRSpPHvrDZguv2+2nPKDMCCmXdUfls4EJFfA6uCxw/ +3L4jeMOToQwEu7HvLXOpgRgAEDjggAQMNb/EaKlaCx9iXlvy2fb6dFwg5etP+zSwE3/ xBKgM/j3+GKW7i8MXoxxkqM5IS7Pk8Jgl1ZzhqcO00gX50soytZjM0ZVUXD+Trrj7IRx yodJgxTo4QdJOT1V5+NitQ5LOpSKu2B5aOI6ie9qzENEWAu6QJzND7HlgJRl7MXJmj4b A39g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773303616; x=1773908416; 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=6Da6CmLvCiNOlwy1v5QAVRL0Kuj4W/ug/xDjVba+jfw=; b=rITBu5grjDv0BklcCvWi5n9ThHwThIsxP8uYk61gNKqIiEjPvpLaudb12cxEAIWlWB /mFTkf2QqCZs7xdIfQ3xHS7cr9KEuEBTJQ/faxRkK4ZilAin1djA5IVvih6XLAfUriCd Tkx49GD3gXPdkN9pVzCyanN1OV4wipuYV3r1ENhlsDjMiJimYCM9OozXzHOgvCvY05Ie ZLoKLZ5ybpIg+78fRtrpCBRuYHFtpqcGkpbtb5JXit0UFL3AibwpwIOo5Lae8ot9Ghb0 O7ppJVLW1qHlveiutwZEiXaPU0teu27LpLoW9eFWj7VnHuMKRFrsY++pZVqovVvZaPtv BZIg== X-Forwarded-Encrypted: i=1; AJvYcCW2U927liJuRnIGRS5k1cvSERrJdroavygBHbOxuAdQuwD7TB2Dr2vRMKF/Y4cZExWSd/afFzK+eLkPzjw=@vger.kernel.org X-Gm-Message-State: AOJu0YzBBOYC/xX3DyvAzBGTKtz+jyNe00Bi632Nnh/0ZL7su2YISFMc 6EPE8lNwRUcWjy6S7JYqTSzCXveiWW1f5xCGFOEJwybQi27T0ATCA0sx X-Gm-Gg: ATEYQzwqWu4xRR+3bsG0LtXbzT03i3gE7LP1QIZ5IpoSkM16pPe7972uRlTtLIo5HXG Vy91qBcAwnx6JWGPD5gpoQotAnQSIv0XPpKXrc7UO+6DtHRJMuB745MzMbSyWFhILagsWFVql6q 4uYZraEWA6xN3wKV/r1kUDJ3dSqhdaGS7J0PoFU33I6X50NqC3vwaBJczyPPoOUleKADQ6lM61V Bz5FYHVlULknoIai7VBmoyLUTYsdqXh2/76VS1ZahkW7qvumI4r51eH2woyFQyZM3vC8cL4Zy+a 0wAP9SCXDC7DjRegvS8uvNg9ByvF76CF5wTNMRw3mQujj/svLSZdlQ1ZR0dUY6Lu9dKz9mmn1lM uOe41ARF/bcfuHY6kT7GVgag1QnAC+cdo0Bl092+r2Zx5jSobb8xBE2SZHBIfI5X+OfNFRO3WF8 4NSfM+Bt7cd7fLpsRDTMgxCJagvwI6wW/XMy97JT8WY+ZLZ5DfbsCACDEX7XBxhpnj2p+mbGXo2 SmmASGcje9liv9f91LjNQE= X-Received: by 2002:a17:903:2451:b0:2ae:4fdb:d596 with SMTP id d9443c01a7336-2aeae769ac1mr61672975ad.11.1773303616233; Thu, 12 Mar 2026 01:20:16 -0700 (PDT) Received: from fedora ([103.92.106.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae24a91dsm64388905ad.31.2026.03.12.01.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:20:15 -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 1/4] iio: accel: bmc150: convert to guard(mutex) Date: Thu, 12 Mar 2026 13:49:39 +0530 Message-ID: <20260312081942.23858-2-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 bmc150_accel_buffer_predisable() and bmc150_accel_buffer_postenable(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v3: stop initialising ret=3D0 at start, making clear about good path. moved return ret up into the if (ret) {} block in bmc150_accel_buffer_postenable(). v2: Cleaned mutex_unlock and goto in bmc150_accel_buffer_postenable(), Dropped Header alignment change. --- drivers/iio/accel/bmc150-accel-core.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc1= 50-accel-core.c index 42ccf0316ce5..4772dc6fcee9 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -1480,20 +1481,20 @@ static int bmc150_accel_buffer_preenable(struct iio= _dev *indio_dev) static int bmc150_accel_buffer_postenable(struct iio_dev *indio_dev) { struct bmc150_accel_data *data =3D iio_priv(indio_dev); - int ret =3D 0; + int ret; =20 if (iio_device_get_current_mode(indio_dev) =3D=3D INDIO_BUFFER_TRIGGERED) return 0; =20 - mutex_lock(&data->mutex); + guard(mutex)(&data->mutex); =20 if (!data->watermark) - goto out; + return 0; =20 ret =3D bmc150_accel_set_interrupt(data, BMC150_ACCEL_INT_WATERMARK, true); if (ret) - goto out; + return ret; =20 data->fifo_mode =3D BMC150_ACCEL_FIFO_MODE_FIFO; =20 @@ -1502,12 +1503,10 @@ static int bmc150_accel_buffer_postenable(struct ii= o_dev *indio_dev) data->fifo_mode =3D 0; bmc150_accel_set_interrupt(data, BMC150_ACCEL_INT_WATERMARK, false); + return ret; } =20 -out: - mutex_unlock(&data->mutex); - - return ret; + return 0; } =20 static int bmc150_accel_buffer_predisable(struct iio_dev *indio_dev) @@ -1517,19 +1516,16 @@ static int bmc150_accel_buffer_predisable(struct ii= o_dev *indio_dev) if (iio_device_get_current_mode(indio_dev) =3D=3D INDIO_BUFFER_TRIGGERED) return 0; =20 - mutex_lock(&data->mutex); + guard(mutex)(&data->mutex); =20 if (!data->fifo_mode) - goto out; + return 0; =20 bmc150_accel_set_interrupt(data, BMC150_ACCEL_INT_WATERMARK, false); __bmc150_accel_fifo_flush(indio_dev, BMC150_ACCEL_FIFO_LENGTH, false); data->fifo_mode =3D 0; bmc150_accel_fifo_set_mode(data); =20 -out: - mutex_unlock(&data->mutex); - return 0; } =20 --=20 2.53.0 From nobody Tue Apr 7 17:55:53 2026 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 D41243382F1 for ; Thu, 12 Mar 2026 08:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303625; cv=none; b=YbPN8vEvrTLl5iSMhQVLTCd16KZ0cYplEqbgNymcv/jeGZuomHRltKeGh9azt4vxIfRU1LAfbhRV1jJWjIwHYhC55QcjrkrrJxFzSmzGlVgEWj/ikzsZ8DlxcN5NsbQAuVM1t9PyMP9z6YrTJRtJiBGA2ufRbf+wQIF8nLVlxac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303625; c=relaxed/simple; bh=ou3lbyq4fDZg+GSVSfhDp3gj9+aEBNAHHddZXTYBnG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q/gh19r3u3RAmZhjUqvXwvJmtzkDRLkqxdWmwBK3jq+Q3uyk096wQ4vC4Hxsv4YlcQsXPkcgc/ZzYpyQM4PeBb29D3Te7TtXUrkOEMXW8dkATqVDkpPgtYNDt5iu7YrlVoaVnvqOgc9fc0IxKZz89hF8RaXgHf+y7XeGUdRTaPE= 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=eXc+vijq; arc=none smtp.client-ip=209.85.215.178 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="eXc+vijq" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c70fb6aa323so271833a12.3 for ; Thu, 12 Mar 2026 01:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773303623; x=1773908423; 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=UY+BDJIyA8NSf40uEDoQLKUGXr4A905L63hTXYyoJv0=; b=eXc+vijqqGgrzxngjrmQD/SsbN52lq7SQOVc70fhzJKXURlwVb8IlRDOBmT0z0H8NQ Uk9axJvyz9DnO6GhRVglJ5hALkCqiZBJGUKadZUUDUMetPRQmQu08+F10E3/42DGeg2J zdwfpM1O5RvXe65J2mO4+/JwZAR/hVuTu8MYxnyG8qGluFxUq8Ns4obPH0N3DiWGyaui LpEWeIKeHkW/S4SX408ky1QUHbYRV6h/QOQPUW9mmiXdWglKcTJ8o9GHmn0fkfjMzKpT ymmctzF/aIR/m8EDOsqn8U2O0zoQcG4ujTNJnCxQqbCE0+pVw+abSjLimdAnYj+4R3Gm 4aeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773303623; x=1773908423; 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=UY+BDJIyA8NSf40uEDoQLKUGXr4A905L63hTXYyoJv0=; b=bdQ4jY0Klj28xjbVOzqrlEO0XdWQAPNZqAeptFDvi3sY1J+CLvBooFHN9AE82Ib/Lt I9ezgKYUibv1LEvw81qj8NwlWSnLu8snyXFVT/40IDGsYjeVOr4PFLYkzFpDYSIo2MBn uSNFafPp5cxCFoShrkvhbQWg2wVD0NubcVStF+EhoKxDC7tq4ilcVfuLFjZI6zTSHuG0 OawGW8E+G/SxhXnGVn6p5Iswd4bZunpJdzPr8SPiirm0wxc8IVufxJWJ6R1Gc7cVx2WJ +93cjVOxXjznWlYJX1DEIwGUIGqi/sHbaiwwjGiUipisT74C+yG8Jg13bTlE9FRWU4/L StUw== X-Forwarded-Encrypted: i=1; AJvYcCUNYboxP9GJpHnGJW7MSDeOx6JT1VfVXfFXLS/26dS+eCv37Kx+OXkoOsQZaxhXwu9firm46ISFmuaDrCU=@vger.kernel.org X-Gm-Message-State: AOJu0YzmQq56jIyQ6tyCheY0KSbMaK0VVLNoD6V2LvIjEeUY4KaEmg+n lKeGO2fXR/mUkcRcSOy2iCfPR2uTabM8Jg/N4a5KI3gX2DTuu2ISATPF X-Gm-Gg: ATEYQzyxXFCIoFYJTej+/VU/aXTIB0GHjgv4bSxB0ccCOkl9aSgE3kRW03A009FW+LN 3InJnqsTg50D7JYmAxhZqiaEBERI1ZFBmjk9OsaGZt/N+5kNYtsXVreSy0cS7vQNa/Lg2PSIeuv KkVQXLKaA+iHNP4QamSkZEdLHIxrOCPBBCG/w4PzSp8zGdYjrrV8zZYP/0gqsecgqUc1m+KrHED DA6SIEBH0JuOTEOqn3to9OySdiP0SMxoCQFdC6UZAje4ewJWoKvscNC7khmzR86YrPPKF7iFSDR 707UQpTvDRGBKBsQar3Zn24iZI/9UWKexyEw/klNOWjeeExKwzu2XRDiqLIGlrKl2tZ5XMvRADV A8xoAJWHgEVIyAc2WG3y10HQYqz2eTe3ejx1qjw78W7akZSlQKyxFd1rJoLPVMT+2IM3QC78kEH sNK9wUNRnyH8uu3JQxPR6DjysAqgD39mQwkXfhj6ZfZgOyvueeZ+ZM/fmAaTX17nFvgWd+00xC5 FibwjKTRmdnEP9C/+00Rfw= X-Received: by 2002:a17:903:2f8d:b0:2ae:5a28:cbac with SMTP id d9443c01a7336-2aeae85a65dmr53352415ad.32.1773303623161; Thu, 12 Mar 2026 01:20:23 -0700 (PDT) Received: from fedora ([103.92.106.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae24a91dsm64388905ad.31.2026.03.12.01.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:20:22 -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 2/4] iio: accel: mma8452: convert to guard(mutex) Date: Thu, 12 Mar 2026 13:49:40 +0530 Message-ID: <20260312081942.23858-3-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 mma8452_change_config(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v3 : No changes v2 : Dropped Header alignment change --- drivers/iio/accel/mma8452.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 15172ba2972c..09bb205a1b8f 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -20,6 +20,7 @@ =20 #include #include +#include #include #include #include @@ -597,36 +598,30 @@ static int mma8452_change_config(struct mma8452_data = *data, u8 reg, u8 val) int ret; int is_active; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 is_active =3D mma8452_is_active(data); - if (is_active < 0) { - ret =3D is_active; - goto fail; - } + if (is_active < 0) + return is_active; =20 /* config can only be changed when in standby */ if (is_active > 0) { ret =3D mma8452_standby(data); if (ret < 0) - goto fail; + return ret; } =20 ret =3D i2c_smbus_write_byte_data(data->client, reg, val); if (ret < 0) - goto fail; + return ret; =20 if (is_active > 0) { ret =3D mma8452_active(data); if (ret < 0) - goto fail; + return ret; } =20 - ret =3D 0; -fail: - mutex_unlock(&data->lock); - - return ret; + return 0; } =20 static int mma8452_set_power_mode(struct mma8452_data *data, u8 mode) --=20 2.53.0 From nobody Tue Apr 7 17:55:53 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.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 31C7040DFDC for ; Thu, 12 Mar 2026 08:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303632; cv=none; b=L8gZt4CH4SftYYj1DmXFZ44w7APNvtJ2XiABgcVLjeAmdpx57Qrg4Mh3rWgE93bR/hYJgcb23oRMY/AujicTrX+yUatfDDEf6U1vpq8Nrpc6ZDFZYdnJlxCMMa5VIrbkMao5gQjxjLeb35mQ8piPFLN4enR4xEFUw7EqEf0j/W4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773303632; c=relaxed/simple; bh=utsr2wFERS1dweRxRw6x9TMZVrqawmdGB2Vg8I7kYpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VYewv+Kv5ZI6UON9qqxNP9lFQ/I5NSNWsqSze/wWSYm2jFUtqJ32Q0tmPdc9fdjGTteaw3QfqKEfwY3M8WzOJDSrDgUMCItoYfK9u1Jj+RPDDxdEvVYrJs88gcNwQL4Br3fBYfRez9dGcRlFFsphQl/0PFY2ABGsq483D8ELv20= 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=bK48kZMF; arc=none smtp.client-ip=209.85.214.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="bK48kZMF" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2adff872068so3864955ad.1 for ; Thu, 12 Mar 2026 01:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773303630; x=1773908430; 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=RQzoVC+zbsYW93M6OjzhineZstDtj2uD7TkTjyo4rvg=; b=bK48kZMF2bLtsZQ9S844dQppDK8b8pMYsTbY76/KewJnztp78eD17lVBnBijsyI3Dr xJJAhEJmluWgLDrzPVwAOtVU5hHa5Ei56nLjN1YCA3wxJ/GN0R/FzOYE3zLwrsKklbhH jJS1AFJFBPbqkr+GBuIZiGHTccNiirezm1MJwgnAyrOPc/HFawztREAFCZzJ2vfb5xgb 4938CTfPk24PJS57AciGOBJj/5xTYA9rZHUinxV2Ppssnjs0o/oVpBXhd2TV0M/4SZrR iTdvz+KEBZBiI/3XtZxjVAjeAZSpu9pwNQ07QKdb98apFRg/bPcRfaCo15TgmTmi2CVG Ez1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773303630; x=1773908430; 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=RQzoVC+zbsYW93M6OjzhineZstDtj2uD7TkTjyo4rvg=; b=SN66fZS7Wur2yEdeaWqbB8rpQsnXNwUM5d3/djVcAaQ3uws8aZoLSJ2JP6WxlaQQOV Pbf3E7kLUhHp42e2+bFRAdOqKbE9KJT2VJnmf6u9EeU/trsH6SG9FzMHucNlnwVgVwK7 f43VzFs979mo9SixbQIvM7KatHQqaM37KpM2lORHTKsDVFPmgpZjI/wU5Z74c0+ODrkR x5tQxwUTIHjq45HIyldyXFFUnzmssExkEPAlMEvfYfcnC6E75DaHXKC5uZBP0+Hts310 cPJ9AsHFb7LlvJHME4Bla5NlcHLYifdPGBmAH3wWJebVFmoipbrz8CHyt0PJ50/o/qmL LTMg== X-Forwarded-Encrypted: i=1; AJvYcCVXOl2woi2lCphZAArkbDmsZ0ijuwEsYS9G14dpEAfV1XeqkId5fBy5nptlKHKXZ94cWMvD5ACUYGSS0ec=@vger.kernel.org X-Gm-Message-State: AOJu0YybPZQ3NHgV+iEuSCRWaWZdG2aLdXC2FQ22dWWcayw8pLYeL37o 2yU1+s/q50PBRSqCPDbqEU5vOYwTEzk2XZrF3pQrL9cCjbXSgL+wEh92 X-Gm-Gg: ATEYQzy0hyRWe7BPEFrbEcs/gqx/rro9q4l7VhQIhi+8Br9FEet3NQF99CsYpyF0wlm qkBU6c1il1+C9oKBL5LluZ/gHvJJ9sctBOfOKQLzlS9fgQTWkIPlPfDZ44ZQSJ3nP2pQSgHRgsp 32kcCnSgtUKAsDgOfQPK16mgWXX9XLJO6xGJSUyh4iJvCH8fKAVj3QZJtOAs6Be2UASu4oeot14 pRn8B3w6dMQhiJkDPkDlnxl1/rtszF37vdWw2ufO+KNvyuqyoHm+SuyRI1PRW24LgQgQFNHAURR 79O+CVhNvCUP3Zd40n5A1nXQgtQCsOwGNlG3jbdDLwfaXsISjJ0lD5V2Ul+IL89Fa2044C7SxJ5 XfW8FOR9X4i+d6DxqxwyNOqQTq7EifS40d4EV+Dfw+3m5GdCMgjl+wy2mooIiu33Wozxi1lqwbV UU4x20sd3v0CMLlYF1dhdwZYoAgS+wMB4RGe5vue2saHFuQuXLX+5sRKQqGQF8hU/VxP2rNPKUP fEpqyaCxmdVvD+Rg5K9XKc= X-Received: by 2002:a17:903:2288:b0:2a0:fe9f:1884 with SMTP id d9443c01a7336-2aeae95b193mr56649855ad.55.1773303630577; Thu, 12 Mar 2026 01:20:30 -0700 (PDT) Received: from fedora ([103.92.106.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aeae24a91dsm64388905ad.31.2026.03.12.01.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:20:30 -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 3/4] iio: accel: mma9551: convert to guard(mutex) Date: Thu, 12 Mar 2026 13:49:41 +0530 Message-ID: <20260312081942.23858-4-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 mma9551_event_handler(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Signed-off-by: Rajveer Chaudhari --- v3: No Changes v2: Dropped Header alignment change --- drivers/iio/accel/mma9551.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 02195deada49..65a913972ce2 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -337,7 +338,7 @@ static irqreturn_t mma9551_event_handler(int irq, void = *private) u16 reg; u8 val; =20 - mutex_lock(&data->mutex); + guard(mutex)(&data->mutex); =20 for (i =3D 0; i < 3; i++) if (irq =3D=3D data->irqs[i]) { @@ -349,7 +350,7 @@ static irqreturn_t mma9551_event_handler(int irq, void = *private) /* IRQ was triggered on 4th line, which we don't use. */ dev_warn(&data->client->dev, "irq triggered on unused line %d\n", data->irqs[3]); - goto out; + return IRQ_HANDLED; } =20 switch (mma_axis) { @@ -373,7 +374,7 @@ static irqreturn_t mma9551_event_handler(int irq, void = *private) if (ret < 0) { dev_err(&data->client->dev, "error %d reading tilt register in IRQ\n", ret); - goto out; + return IRQ_HANDLED; } =20 iio_push_event(indio_dev, @@ -381,9 +382,6 @@ static irqreturn_t mma9551_event_handler(int irq, void = *private) IIO_EV_TYPE_ROC, IIO_EV_DIR_RISING), iio_get_time_ns(indio_dev)); =20 -out: - mutex_unlock(&data->mutex); - return IRQ_HANDLED; } =20 --=20 2.53.0 From nobody Tue Apr 7 17:55:53 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