From nobody Thu Apr 9 10:30:01 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 98D453D9057 for ; Mon, 9 Mar 2026 15:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070482; cv=none; b=KAOXuZrzt3Ljrh9VzVel2E3UctfKAMPi46R6E9i9VJ5rRToKNoZJNnO5zuTlKGQKVI7NP/os6Ss6LSJXM9sQaBwB6fWG+lP9u6R2kkWgfXV1L6FfmNILLSrTlP08+oKbyJw8fSq/T91sVfl6kvrr+aHKiMQiDnFVYwtMvVQjdJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070482; c=relaxed/simple; bh=PPcH7gq7zegC4ms1+4zc5u6TowItE1iBiFKCzoS1KW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ru9jXbexxQUrLOvANOcOEZ7zRQ34eXh17nMutjfrXNQ6Z9wubfpxwQCKByt9Fq50m8WJ1i5G+yvMAjWKeTQbnH+aocOyQIkcPo+6LCbOsmreyj5HXxJW2MVvU2V1OyoyckgRxBIgT8rVucoLemiKk12h7QPkzYP2GLHVqz3opDs= 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=M1kRqLm7; arc=none smtp.client-ip=209.85.215.176 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="M1kRqLm7" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c70fb6aa323so4161783a12.3 for ; Mon, 09 Mar 2026 08:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773070480; x=1773675280; 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=/bK0WqhpBZ+pZa4H+CeTkJHxMvrxbA/FN+llhWOAZnc=; b=M1kRqLm7teVpYG/kikqcDYUxWvQen/S9zDHJxB8sWZrBQ+zZq90UNc9+A4aWxp1wRO XizjPczFJP1VwjxgsTvgVv/c8jSXb1gEUqnioZ90WLfGYpIiTCaFojF0uEuAi0ZuyeSE srPlvaz8m/GqzkYAd1Pyh4rxyM0fYNydk26K+X8GpUONxgsUMpVSJmZfcRTtPF1MvkyT 0LPs61mKfMOmlIDBaOI7G5RHb9jOrCeB38bJjywaHyeWEerQmf2iIWoRbVw3+X0VKGIP /6+tQVd9MZC4FaeOKGu9wMJnPxYWN4Ss8qrmeGpr/J+cdXf1kMwEtVeVO8BiVa1y1YE6 ef+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773070480; x=1773675280; 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=/bK0WqhpBZ+pZa4H+CeTkJHxMvrxbA/FN+llhWOAZnc=; b=Llc1q7JzwBQ5KG/pTSn/a1eeByKEs38RQYjg/jlscG3k+T5jEd08t1u5b6isyZAG15 TjWV8HYrX+Fe6Iq3hbmXqvuPXsfOKZFBydbfMOFkR+Ij0S6peVDysXDQV6kCZwpg1+lq TrrKXs19gyQCeapJY7Hz7dPAooqnrJGrHWKDH0V61vqUh4W8x7njZTp2bNyxkd8TtMRf WzgmdLTWJM1n8dVW63QO3AzmZFbYk1iZYBo9nyijEwp3biMt1MwxGfZQvrwZO8EYbvPq Q+/bgTgoZiQ8h1fO1KSa8/PPEBgou+l5vgiXzLcEyUOZs8Qd3ByzdaMJ//41I+bjNAb1 f5vA== X-Forwarded-Encrypted: i=1; AJvYcCWH6S7sex9zAdMFWmrE2vpJTavNl95PqYqE4z4BuNJPUrYE+hViiSetQzRftcbsohWMfIulz4ghM27Mg4I=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5rOBr7ZVBJ5x9HYl+p2bcxxxYBq0r5ElhYabGRwCTJAUqcZoO fFR63q1DQ9gmLuzjagXvEGoDVtu9in35r/I4EcCNU8qHVXyRMJddQlo3 X-Gm-Gg: ATEYQzyuwrRMVj/yPwxNH5Dd4gp8n8PmT3U+bcFT/FI5hKU1dpz76Pl/Ne2w/OE1RKK iigZzoze2Jd0HHweYzaB7wLLlvI9/Xx/FQCDvyy3Ada6Wt7HEECKXzYv1PbRU4+9CXulP5uE/a6 692nrYcyi4dMfJMhVrS72v8az4x7B89QcLh5HjG1Vf1IcMGWkQ0JUFtqyOOQagQ1VkQ+XZxCfcB 18aycYnnLtuuhm7L3wh1fgtrdtsr0zRB6mLWA2DV9NAhFE5QyEhfbIbhVVHMTCXNBNd2Tv4Qu/8 n4pW191seWz4nK4tCKZjvWRXPPc/kiGpNhWvG7eZI0T79YAqnxcE4ywR9epfq18C/spgl+FuQVZ GlvuWZVkpLTSgEo08mlsJgyrbUBhSK9jdnnDDXnqjkqHfIX2TxhwJCelpEGDIZwlvLw9IU4tPgT klF91n+jLL78AhLF6LS9c/c4tVkmaWOirqZBZAFn16aKK66zQr1/ta/XfSy9LaT0keFs94smCMV ZtIqtLpo6MO/tjbCsM0q2HxzJI= X-Received: by 2002:a05:6300:408a:b0:366:14af:9bd1 with SMTP id adf61e73a8af0-398590ff382mr10268050637.71.1773070479847; Mon, 09 Mar 2026 08:34:39 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739e16cebbsm9316563a12.16.2026.03.09.08.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 08:34:39 -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 v2 1/4] iio: accel: bmc150: convert to guard(mutex) Date: Mon, 9 Mar 2026 21:04:05 +0530 Message-ID: <20260309153408.71512-2-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309153408.71512-1-rajveer.chaudhari.linux@gmail.com> References: <20260309153408.71512-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 --- v2: Cleaned mutex_unlock and goto in bmc150_accel_buffer_postenable(), Dropped Header alignment change. --- drivers/iio/accel/bmc150-accel-core.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc1= 50-accel-core.c index 42ccf0316ce5..bd9791c9fcf7 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 @@ -1485,15 +1486,15 @@ static int bmc150_accel_buffer_postenable(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->watermark) - goto out; + return ret; =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 @@ -1504,9 +1505,6 @@ static int bmc150_accel_buffer_postenable(struct iio_= dev *indio_dev) false); } =20 -out: - mutex_unlock(&data->mutex); - return ret; } =20 @@ -1517,19 +1515,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 Thu Apr 9 10:30:01 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 795CB3D4100 for ; Mon, 9 Mar 2026 15:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070488; cv=none; b=UVcszVQ9dwYsCaoSbA2uoAcIq1P5gLvu12x4H9D4rqAhc7kg56pYRpYEFK0xmnG6I1gjnCoY4EyPmX/tt3dazKroQlTVc80U31VsBMmLNDekJXkXPZBBjd+6awU7Pc8sxs39buMLkSemV5V50MvM6nks5/fYRyie6L58OZaf3Ik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070488; c=relaxed/simple; bh=HGqw1CGl9UHWHkuaYJ5XBx19Rw+kwr2m6DgIvwtTuuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZBwMHhu2ewZhRrR1vwjr9abOvdpwgtpn0cH5ZaWEyaUTrWUpIqqS2ttYR2ZDsXWejjRMDVO4pxP6IqyTqk3xYqo181rWK/Rkl8mVwa14KWYDiRQdvtwLU8IXRw1jQMU2/yuUWxe7cCLVXBdGVP3YlZitEp8lrQO4mbHttDBwaYY= 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=ngZUh4Oc; arc=none smtp.client-ip=209.85.215.169 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="ngZUh4Oc" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c70f91776fcso4943216a12.0 for ; Mon, 09 Mar 2026 08:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773070487; x=1773675287; 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=Ndt3vIv2zGaRlQuL9zR0zjbGPoGP608g1cvLrbOVtFc=; b=ngZUh4OcyK6zcm3snFf7eMo9Su3q/tFX+kgiRtfmjDK7zRnhLGo+FHE1MZ6HGEU/Dj JOleJquYutiAT45cpV8Z3P/qm7j3gaYJ7+MS0vV3f1YddhhSXj3keRArBzmmXFqKmpZP j4lqbzcwYkP0fZyX4UJgDRHWkYrQ6isKMyA5vHOm8oudyI8wz1l1ISojT8TJ+93d+wKx hiJp9gQxhrmAIvw2LDraBo+fRyVTmyIxaa0DkKPehcfHvuqCj284/hDQco/hDj8d1yKi NZKoMHEgAtKbVFPXBgsBoQImVZNnixKaA0Z9lM9+4aBFOS8VMzQBObNnvkMeq6ljR648 n/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773070487; x=1773675287; 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=Ndt3vIv2zGaRlQuL9zR0zjbGPoGP608g1cvLrbOVtFc=; b=G6gT1t4Osz/eCWn9DfU/dpnLgG2gi9wTuyBQmiCrM+5ZyCo6BDBAkz7bV5eqNYlyZO S2hVP311gRxiHpG/hnP8DemnmFPP7hBwK9iBiSQ/CJitSxAxU9lAafTyqhZq5ZkLzLBa Hfcf6Xu1vnlggFyL92S2u96xB01qqaVyBg/u62II73UIdpNxSzm+C6/qtTIzcQC3/bRB H40oJPdxtrUlkqCnuGtK+pV/jNKrJRR5rI7ZEhVBRB9NXfMN2o6eg+bPkopL/2LQ4kUr e7WumQvwevgumTaEnONyDQ6jNtIk/7QJD3Tp/P8XuoXqZVDvWZYRX1CAEFj+huyPYCON fRDA== X-Forwarded-Encrypted: i=1; AJvYcCXSOu3q0cs+VZcS9jobl8APmRNS0CLFdeHBf9STl/30Y+kGOl6JsPEaUpMRLOvL7+0mkzeaqBpC1U8/lqA=@vger.kernel.org X-Gm-Message-State: AOJu0YyuzoYNDS9yzf+ys26yuPTC6wE3kTRqdeshsvtdivTszhpD573r IfPrBCQyUc8G2QBNGmarqNKIK88F5H96Wh75Ld5COdL9IhjV9WlADDHX X-Gm-Gg: ATEYQzzpDU97WjxuQbhduIuKYOTAnZtxbmzxJNS19DSZ9gXl90fAZl/PZQaYmC0MOLH MUIr50i2dkhsbGUKB53E6+lZdP1oSu1zQoq4dIuxYUN14WbsHE+n6Zjj8MhZF3e23L+Mp9ucw55 KPWlpIB30LWqvXzDMT9f3KfYyyYNjRoDI/tQUDCa2rbprrESu9G7Yx4nQI1HwUv1aKrkklq3B3V FFRs8KMrwneyW1iAJ899od3YvMs8cunA3Mo2jAzOdTtWTHzvO4TWM5aiIV7ikmu8tY2NqHI1p5j FWEh55e6S09CeU8KJFHKy9X4iggCgmPYPBMnFte+Q3o4F0N1Zj7czOvgnQUY9dtkm/flFRGr9ci ovfxQuJ4ujmrHm/DJYM6rMYveIO4KXOgbXY9AzE8Jyt0FJ4kqhXMtoX/F7WhKZhFHIaq5cwATRK fif1oh5ZNBLcOet80TEW08c8sOFPyAfxjD8893QoDjx+8kUvYTf6y2kcoRLsW/+5oS2E4t5NExI xAbrxvzJjkzwkFsOSFlYaxMVsQ= X-Received: by 2002:a05:6a21:2293:b0:35f:4e9d:d28b with SMTP id adf61e73a8af0-39858fd8a8fmr10759904637.18.1773070486764; Mon, 09 Mar 2026 08:34:46 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739e16cebbsm9316563a12.16.2026.03.09.08.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 08:34:46 -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 v2 2/4] iio: accel: mma8452: convert to guard(mutex) Date: Mon, 9 Mar 2026 21:04:06 +0530 Message-ID: <20260309153408.71512-3-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309153408.71512-1-rajveer.chaudhari.linux@gmail.com> References: <20260309153408.71512-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 --- 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 Thu Apr 9 10:30:01 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.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 D1C5731B83B for ; Mon, 9 Mar 2026 15:34:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070494; cv=none; b=UGK495YkmCU73a8ihbH/ugiyqD4XM/U4C732xDbLNiT1wGlpu0WdIB16I/Q6ova20sjJ8rSFMCykpCWHeBioBoK9hnSttlHJLZ5yWp/I2bSdz9pYydWyPhrtmy6k9XyHp84uhfDfXUOi/X0IyWWGItU6J+YHAiFCh+YrcApSk5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070494; c=relaxed/simple; bh=F3cLyKU+aCEV8LPCrPgFgnGx7rxodlQMavEUkf2SfO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j3+oehbzecmwjQ3/bItZWJiqTzSHyhrFoSx5qD5a2TOztpnMzG/6+YEWiXElYnQOWUV1zgh03qFVzDiCcn2PhXVKjVbO+JkOaFkGdol3mgHcs06t4Qif5eTnBW7YFwforSxCXr80rkuHgF36g28tctm0O7t9ouzz3QGCDhG8Qs8= 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=JP7dtz0I; arc=none smtp.client-ip=209.85.215.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="JP7dtz0I" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c70ea5e9e9dso4436241a12.1 for ; Mon, 09 Mar 2026 08:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773070493; x=1773675293; 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=2aTy0R+XTQKbHXXKr9Mnyna9OWj3RkjcnoZQYJLkb9g=; b=JP7dtz0Ig3QyfxodVaVQNmu3oJk5iKQPmqk0Mef4BqQUnzmBJyt7cowPOikhJ0qwOr VfspcYEz8odxAX9UxplZcB7zWNGFgswde2ixgT4o8OIN9odG9uJUuB+0Q/mWEetX+7vW md5+Nj/yEJY2scRE52AkAoQNc3V/muba4nwDX9514zNsvkpKvNRK1hbIx+Yfh9bslFKs VrYtFIA0yt9yiH29Ar+ga25qEZj78+DbjuNIrJnsUyaN9zE8joQfMoOSECnPL76D/POg jeUZ86eV9Ng1jdQflclib96LYtcNVrZhfNDHGG1mrpYghIKon5KKiNAg1rCGx9YAjIt0 yTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773070493; x=1773675293; 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=2aTy0R+XTQKbHXXKr9Mnyna9OWj3RkjcnoZQYJLkb9g=; b=wEnCawifN88LH7E3XKSpof8Ig24rx0UTaq7xj/45qt9uPjtMLb2nSg0DduyNrNpAG9 1hR9ZdumUMiQPf0X+1ZeBGXz5EwVhInXIF0ZtEeBT55zgfGcJ5bTzan0IWJrpDta8lcd 5C2Wg5aBTwfqWb2/Bs1W4HI+bxqJVtWxAQqQnqlZU0wWIBbGPx9EkNkvJpMoufBTGmRh TG/nwk3mDUu1ehjbKSCVoN8+rF2tKGTv6TNMJT8cYxZBdzRPL5JSN1pZxWEqBMjM5YwM iVLKOgnjV9fqKpXoMmZ1o6VxAB4Hsx3kQdJiRjZyzTiUXuwA4Ig7XfAv+Rw/CbwCuNSe rldA== X-Forwarded-Encrypted: i=1; AJvYcCWTH6hQ8h4QavgjL15QF7xk9PYrDt/4zMJQjBVVYqmb9t0IJeR3uPTIodjrn0kCUMIPlhq3yeLdZRJP2ZM=@vger.kernel.org X-Gm-Message-State: AOJu0YwaxPYIG0nnxCvV9Akax3RFltDht+S8YZWUL5CByUIuo6v3EbYn Gm+qkxsZtXVzP9gCL3O38xZscvPDUfXeDsV4Lc45Kq5JaEyoj2ZvLIDq X-Gm-Gg: ATEYQzzKCmvz5zqQMKguDk7e4Cll8K38IZwCax4roWEr9dicd+VFQ9gCLrR3lesfPcR pJ92wkLGnrYWM0jDtAWCjHRuoxONn3jVKaUJVQKLSGfsnGrnhRMremwAFu4cCTR2t6I5Id8gL9W d48Tk30rvdhcdp65XY8d2kX3/QqWfexhDE2j4gk8LitM0iVOTVDczDUzW3x1rn4tAnUdQbJmRec cs7PpGLp0MMehgHct4bnLszs+AIYDo5ZG0ibUbTQFCoVCKU/WxhfvOZc/cxYiTMt0wzrZGq2ENF OSiBmL3aztspptQ/arWrf5rAQrhQgrBpDPozfI9gja7q8WMfJny74HAL26NbgOu4lXuMV/X6YTm NTbEokfZLgIsrR9H9tUnVdOeZOKs1WvS3V5Xqx/CXBb4l4rrBUsIGo7YY6yxrhiGSWxawa/yEnz aCuzWTonMdTlcVfCdvtfXBLyhUztNGwxKwytuEcCJJlupMhGOlARSeAxngu3cE57pWylCQFgT05 sVjAdxVH62jkFNQhp66xuYq6P48y22fSeC6NA== X-Received: by 2002:a05:6a20:ce4d:b0:35d:5d40:6d79 with SMTP id adf61e73a8af0-39858fb5ea9mr11500525637.12.1773070493270; Mon, 09 Mar 2026 08:34:53 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739e16cebbsm9316563a12.16.2026.03.09.08.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 08:34:52 -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 v2 3/4] iio: accel: mma9551: convert to guard(mutex) Date: Mon, 9 Mar 2026 21:04:07 +0530 Message-ID: <20260309153408.71512-4-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309153408.71512-1-rajveer.chaudhari.linux@gmail.com> References: <20260309153408.71512-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 --- 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 Thu Apr 9 10:30:01 2026 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 0300F3DA5BC for ; Mon, 9 Mar 2026 15:35:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070502; cv=none; b=FsU5P08jkGhXM+Q2ILANV2QKMoKSKmBQJv0aBp957GJW/8zgZIEB2v1+LwF6EPhUv4txEAKSwK9gcYHW/6FzkBskpv6w0p0WEIIKGPGzbvjOEiSkPxdWEISMAxPzcYA5vrXZ5Zak346u9Mx+6WeeQVHdSSs3T1bQLrGNgSg3a/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773070502; c=relaxed/simple; bh=vrE+CMIeHFYAeyFK29dqpzRZODZ4uJrVcL4FShk+xks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IWFzRdnXVKE5CvLYhBjGB4l9d7xVGF1u/CKc2ATh9L4K9URYCSZolDr/hLNhb4vFRZ/OdEdHyQ5whWoW+ocfA4vhAYbG285o0mmH0yf1uE/vRuOFqX+222sDd7bTNc62WNzB5TwEEIkGtJXNRBO+LFRF0tqWTy43Vm+GNubMcjQ= 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=ZTyJ2GtI; arc=none smtp.client-ip=209.85.215.179 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="ZTyJ2GtI" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c7393536e53so1652292a12.2 for ; Mon, 09 Mar 2026 08:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773070500; x=1773675300; 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=TofA4+zPs6CJY0GvXEWYtD82c2puhy10CmQlWfM+rhE=; b=ZTyJ2GtIZJGfvCHT04sM3VYYS00GRh2OA1UHiaIv69ban+GZPat1fmzNaQQC6JCBLV sClXFBCXTlU4ngiWkjOR/MykrClseFPY9Vwtb47FwHhmpmHyAWXzDTibv3BLD5yq5YlN Z78jj7O60Tdx8iyitx4e9C0CBmmFIcE6nK8+eog+CNFJnHuBoeKautSFXM/zOQxFGz4X zk21FVaUQZP4Prtycly1q2GKxKaGKP+xjNnjf8ab5LIE3Kc7uCbD9Zc2HhvqtwW2SdgZ a3L+qFKmZwCN8HQju9KGZRXpGY2AfqK256jW/OADcwgir99MS5tW526a4KPuWnnSyoeM ndJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773070500; x=1773675300; 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=TofA4+zPs6CJY0GvXEWYtD82c2puhy10CmQlWfM+rhE=; b=miEazkaAx43FHntXXdbcWNUhIOxvCKE/AE1y49hmQW+aGwQd+ADfNiKyaeBeYBMb/J J2X+jb0cgqMdz71j64QaHtMkxQcWA0/RxoGUtH0gWZQpnwu/QwZStLY/e3LtGsY91EP7 em6v/dbAtWXyK19Ml7kKvQ9TpihR2+MPqBhl5u/XUw/pJdQ49YgOjoQDhUrByQ2gq28h MEHQAHosyJMl4NUpnVaGKE1xNOLBwhgLkhvt8bF/D6O2UVbm3DZNlDh+TJn2721tGKRx YNWipGTeFbSMPSPPfH485K6mC+ridtq7Bld8M9jvvJKKLn7xMvSlVcN9ASuqAXfgnXnx 3EAQ== X-Forwarded-Encrypted: i=1; AJvYcCV4GI6Ep3AyOiA6rNnfxEKAarb/qHs/bddAwmAmm0Po4CN7Q+8w3w23oh/WgIKT9tNi81cbVpCfcJ9Ukv4=@vger.kernel.org X-Gm-Message-State: AOJu0YzIhpvXCruw7NcutP9vMwVDe6YUnN21wLvYaRQbjG8e6Vp1gzHN dh2+flMCyoYWzrkrM0FZcZUsY+qpTOX694Z1DR6P+37nNQv38zgMSaqU X-Gm-Gg: ATEYQzwSXXTizCwW1lsvf1nQihwqJWN15tMazkmN7zHwgu+pJ6ZAmJhBlbMww2ZGmZL HL0/KmJBZ9sr6RIOeN0uCWPpavJxfDpUUf9M8Wfst5XHA1ZA128A2Q+GGWFqxvDzJ+x9vwmXgYf wbuD13DKVz7UJl9freA2yHy7VLflkeXeKe0UuUy8AGzjd3SLXWTwRWVyTFrBHS8DcGrQWSlFpQG xw7ZocjucmoAZsLdKzltSGKFbyjHANeww+mY2oxOhR8ns1FT0VMVKlvIzyCG9QjiRIp6lBYcYK2 0IM/OMfAggfh/x41wRUTuVfPqHhaEMTl3rF6bZ4IFd5FqpLas0UqvNotugIf65NnCzGep1t4q7Z md/S4B/JRbfzBZLEdpZCGt8ghOcYHcT1oQAI72GhACP0d6m3Lo1tSM6O8M1me6FDh2cnZcaJuZf vwZu52KFC6O9Q+HuxRvaADxKvLF2e+sqMg05odfMB4OjNX/+eIBHVEsiaKXryjLNcw7Ro0Jb09f jy0i8JexgB3JSSvFKxgi4TvGyY= X-Received: by 2002:a05:6a21:6197:b0:398:a71b:a0f8 with SMTP id adf61e73a8af0-398a71bb767mr895162637.14.1773070500331; Mon, 09 Mar 2026 08:35:00 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c739e16cebbsm9316563a12.16.2026.03.09.08.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 08:35:00 -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 v2 4/4] iio: accel: sca3000: convert to guard(mutex) Date: Mon, 9 Mar 2026 21:04:08 +0530 Message-ID: <20260309153408.71512-5-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309153408.71512-1-rajveer.chaudhari.linux@gmail.com> References: <20260309153408.71512-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 --- v2: Dropped Header alignment change --- drivers/iio/accel/sca3000.c | 97 ++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 55 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index 4a827be439a2..8a06602ab41c 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,16 +425,16 @@ 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; } @@ -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,11 +1111,11 @@ 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: @@ -1134,7 +1135,7 @@ static int sca3000_read_event_config(struct iio_dev *= indio_dev, ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL); if (ret < 0) - goto error_ret; + return ret; /* only supporting logical or's for now */ ret =3D !!(ret & sca3000_addresses[chan->address][2]); } @@ -1143,9 +1144,6 @@ static int sca3000_read_event_config(struct iio_dev *= indio_dev, ret =3D -EINVAL; } =20 -error_ret: - mutex_unlock(&st->lock); - return ret; } =20 @@ -1277,10 +1275,12 @@ 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, @@ -1290,8 +1290,6 @@ int __sca3000_hw_ring_state_set(struct iio_dev *indio= _dev, bool state) ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, (st->rx[0] & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); -error_ret: - mutex_unlock(&st->lock); =20 return ret; } @@ -1310,26 +1308,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 +1334,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, + return ret; + + return 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; } =20 static const struct iio_buffer_setup_ops sca3000_ring_setup_ops =3D { @@ -1372,25 +1362,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 +1389,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 +1407,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 +1492,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, + 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))); -error_ret: - mutex_unlock(&st->lock); - return ret; } =20 static void sca3000_remove(struct spi_device *spi) --=20 2.53.0