From nobody Thu Apr 9 10:30:01 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 BF3E539E176 for ; Mon, 9 Mar 2026 14:24:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066276; cv=none; b=k1OVo3dPGonlAmUYNzIuiTkz7214I1R6QTALW3ImJaaj3tsEWd9zlfJE1yAHymNjHp2rU+S2eap06VfzM/IiOU8J63IebhrBNOhEltazs/+y3TOM1Acg1c/g2MC+Y4oa1PcoiJ5DhWbyzzb0SONbfOwNOVyZoFaq0DpjQZtoNTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066276; c=relaxed/simple; bh=CLI9Tm1/iHPRkfpythGWyrB52NK/CNiw9SacNMZjIS0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WSSzQCC0SaweP5lqQ79q16KTAfAeqcracOzB6A6wAXbURG14xUwF23XGUk6iQMennNcx3bE8/ajpG/zMT4LVsCI+uMtuHfS9m8LRXm5etZBR2zPpRM3xzKL/E0atQHuHTeXeoBtQ2t9tOVdOFcAue3hfCToSho7Ea9LFoR+sNuo= 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=K4CU5VHZ; arc=none smtp.client-ip=209.85.216.54 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="K4CU5VHZ" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-358ed696623so4856083a91.0 for ; Mon, 09 Mar 2026 07:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773066275; x=1773671075; 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=Bgyeu6qwDJxvPvHbOAbXi+4MEkb/h61SteASe+ruxqw=; b=K4CU5VHZxuTKL6cp5UwMYNe658NAjSeDt7YTzZre2yDAFFwwxuYk/4WbEEr9r7HFR5 JZ6KXpIuJ+bovhtgTb6YEt0tHyaJ/WWzKm1nQ6viO8bj6UYRU/agZhPaLaY9cwQ1cvAU 4G7U5dCaEsOotiKmJljCeSE2dQkZQRKcfaPCedEal7GhsxoVGYYM2uIb4tsM4WqnkOG/ OQKa6v85OcysLi5obvuYxSUbkosHixCZaKegNQkseQg2O/yoEE74diE8Lc5zxrZG/0qS vDFmZW/4nqP4j/j0Yq3pGjHJ7tN33PD30u9xxU1TGi7ZAGBqrHy5bhjRSCEv1pyEf1Ic 7zZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773066275; x=1773671075; 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=Bgyeu6qwDJxvPvHbOAbXi+4MEkb/h61SteASe+ruxqw=; b=pRhwQa1TnTgzS8sya/QQjzbC/8c+y01b/pV3IubYk+0r97EN5E3z49BEu3LRDwVT1l EdLqzHDy6bhlTzsMSpfVlp+vH52sAnN8IlSbIhgjURP3FxiUOqkSOdYAuuQPGXMyAL7j jNFPc+i+/RehdzZ5TAOBk+IWp1GWzPmy7r4jhzHy66iWCqNXdgLFDv3uraJjcVDcDKsT H3S3kPyHSnVyQ4/Fi/bI6vXSKGSJNX9VBoUD9CfsZK03Mce8V0ct6H0Jwk52wKM3z9nm hrWnWsqAHW2hTAr1lQdB+V/YECBs9xQ/ac2OS+vHViIMSqOznIbRpggfctwGuOud/O3Y UaHA== X-Forwarded-Encrypted: i=1; AJvYcCVZie0+jisMmu+nirit7Mvvcw6IqlZ3lJfXUZB8+WOMxUdoaIROJmRwKH3w95diY+zfkCb331sD4EbFxq0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4xzYa1PcainZ+3JYcZxi/CsUdkb/O0f545ck6otsIsrCrpfNu t5AhKFzd8jfwDg77OUhJJBRCBzOCW1GZbHVui7R59PerQeXhwBjXwWNI X-Gm-Gg: ATEYQzyC3tkSAKtCRI7sIspvG8H4dLfzXwXTirw9zcV7DQtM2NdVqhM3upbKP6WFBb7 OYolvFA/MKKw7naraIl5vMjVOfRWytYaQ0eZfICnD6XQtvnLw2rgX8zCB9nBmcNUZo2HgyNwvUB H4F5+M/i8E0MZ1zYf0Xh9WGZGEbDXC+SFt0Stoq4tREjA1ABdYPLcMQZND1KPTc0stPzVycB3al QP4ySOpjKk4Ht99qVQQa8Tnm+J9TPcl0ZRXVhNKokyQKTZZKeZVpjSJdk5Y6S1M78m+Gt6FNwWw JSN5RHbhv37MvSAmQixyUe9bT6Ym3tEQB3jgseMZcz7Aj4x8nVB8BZHIOydm1s8wgBIF0an3nZI AFifjzgUnbmkSYrbEkDWOOR2e1lLmTd4pZZowb73hStiJlCE9hSAr1go6t7M9YV3HCZYNti3edj Ml4R+jJtI5h/UNQKfPNQfiAuxvpdV4E+MFpvCYcRqo0cPzc5JBwX4oocOMJuTJ55RG1eOLbZ5Oy ncdwB0om37lsOodZxQPVCGaH8o= X-Received: by 2002:a17:90b:4f4d:b0:343:6108:1712 with SMTP id 98e67ed59e1d1-359be34987cmr10184664a91.18.1773066274989; Mon, 09 Mar 2026 07:24:34 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359b2e0e1aasm18985311a91.15.2026.03.09.07.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 07:24:34 -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 1/4] iio: accel: bmc150: convert to guard(mutex) Date: Mon, 9 Mar 2026 19:53:49 +0530 Message-ID: <20260309142352.57407-2-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309142352.57407-1-rajveer.chaudhari.linux@gmail.com> References: <20260309142352.57407-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(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Aligned headers in alphabatical order. Signed-off-by: Rajveer Chaudhari --- drivers/iio/accel/bmc150-accel-core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc1= 50-accel-core.c index 42ccf0316ce5..9ae325cdfdd3 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -4,23 +4,26 @@ * Copyright (c) 2014, Intel Corporation. */ =20 -#include +#include +#include +#include #include #include -#include -#include -#include +#include #include #include #include -#include -#include +#include +#include + #include #include +#include +#include #include #include #include -#include + #include =20 #include "bmc150-accel.h" @@ -1485,7 +1488,7 @@ static int bmc150_accel_buffer_postenable(struct iio_= 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; @@ -1517,19 +1520,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-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 E17623B531C for ; Mon, 9 Mar 2026 14:24:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066283; cv=none; b=YvY2NZLYpXiy8/uByO+P5hcrjVLAvT5gcFNHIbMLPTsNOVgBpHmbidNDJVSQkNi+zRAWD04KjvO/M29+VfUo3FjFyRZT7S2+RqRQxXKQeMSQeQR6WmrIb16vt0OjjEBXLsY77X6Yc9uSSgovTL/lZFmReODNwqbTPJ9ovbLyxOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066283; c=relaxed/simple; bh=Xk7m8/mkiyg6mbJTkQMB8wQklO+XexSBMMj2nrqvkFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lTAh7ghpcnpdMABKQxGUZVTpdx/6Vdm9EFy0ZLYUdNuN5xtEQ13uAZXCwQbbtu0A34GgdqSvENmeHiE1R0M+KJMPM0gcJV8dM6YlJMkQaAlIZ+FizUe9+oEvuX1VhlXnUkM6sZSelz6tj355eiNtUCnNoqph5xlt+6cEghMzp+0= 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=nB5LQr86; arc=none smtp.client-ip=209.85.216.44 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="nB5LQr86" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-35691a231a7so7258087a91.3 for ; Mon, 09 Mar 2026 07:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773066281; x=1773671081; 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=1Gi/KzmvgogoeZ0YSdr3ckB0WaDai77wMnlhlj2jBFg=; b=nB5LQr86/UgC8AYGBFNtwgcSvOVvz7tAH0PkMTdf+aYhdtOk/GmSlDVkM43ypysgip fVFEOBJiXAYB7SZZvqer8C0U4YHWi6TGm2PkO+9pUkpKcrvBsl0Au1tV59xD06X+Z51U 00E5zvIjITwuGAPc0YmrQ0r9JyOEWYHORKm1azkLEcVMxjtWnfpuQD3bCZeEGm5yMjQi oj0c1UF6BKGcH1yxdV043nNmPmCItV/PFKZ3sVjQuo3CB+F6UESKb22QsWb8TR3BgYWA TYFblz1GgpxSgB0OqgRk4UdrSL9bAIWGNB1CAbWu7mhvLhZ5+5SaFTOX+LBgGQqusks+ vGaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773066281; x=1773671081; 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=1Gi/KzmvgogoeZ0YSdr3ckB0WaDai77wMnlhlj2jBFg=; b=C+XcezlMxGEEvhKpwF142i+JTsIPEkf8hos6Q8myD2gPY/ALHsGnrdUsCp8VxszoUz wETRYNoAJ1wDn6AFBCGU8T/vZ3fA9xwgRvVJAbBhPfHUjwbF//34HrIOCMd/Cdg9K9NQ xCoaYSNLaNCdizMDU5dm/WVJwDUGhDu8aOQ9OS3V/CXOZ3XJrGniUsmljDS/xDvLiVC0 VkOfWPrHpF3HJW21ewtyIYyjDzfIYJ9bjmTFwPOrR7R/2ZGBoQkGooET5uoa4lCuf463 mtTrgvruCfVyNXNSgtYF03QaLMEWx//+WWMhfLAleryRucyhrECEB9smDlqtxWgQz1y6 Jakw== X-Forwarded-Encrypted: i=1; AJvYcCVKSD+DMNUjUpkGEOjcR9rE4jPDbXc5B0mD6vUI3kQDtVUZmTKLXumh0fhpAJBMLtqsidMkT2Wxs4gCJnA=@vger.kernel.org X-Gm-Message-State: AOJu0YxcKZndqqZMhKsYaGEe/GVJvdyynFMs39j6HyEfgeWB6AgwULqn 8sRFUYFhAItMBPe+JrRyrfXdalCjzL8FBKwVvnaYQq4dlT2R8uERBB4U X-Gm-Gg: ATEYQzyIvfLCzxsdSBJEeUjKk34ZECUy4lkNAVNpmjqITe8Xwxmzw8K/buoVuOrXkpR a1G8+/rxzQIukUvln/xdpv/eQFj8pQerh1Raz96TsoNoIR2HXtkEwuQ8eD5DfebMsm3xQkEtyOY j8hKISWlmNsw25RxigDhitlJiKGr3703meCPS5FQ+7T7c/ICnPFEJ+tZFgAAyeNqSHriP9WmTfy 4QWPMSb1rbZPBzgdV8rhOjBJychw8xVTetHatFdG1vmxWbkQRZ7TQsuruPo4MZeg8ZguwSHNqZK yxE2/15vzAem6vMB7K/2NPCph99ssO5CvMCeqnZzCZuQDhAZUDyUKF97OxQZsYAY1rK8DjpIxfC aMVPBl3tUspIqeHdcdNDGBfBEQe91Leg0M+fQhkcRXZ5RAnJ2oSGL/2LwNYqogMx/daxtZtKCWT JtJCn2+otKynRS4sCqVpcNMmyB3d9xeHWgnWHpRhxeq+4Pke7OFuDfj77FhJ7elpK3jQQsY0Wvq RRQbRgGgT8cPxzfIYY9e7O2a9+ByD/dT+z67Q== X-Received: by 2002:a17:90b:5587:b0:34c:2db6:57a7 with SMTP id 98e67ed59e1d1-359be24b367mr10913972a91.8.1773066281336; Mon, 09 Mar 2026 07:24:41 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359b2e0e1aasm18985311a91.15.2026.03.09.07.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 07:24:41 -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 2/4] iio: accel: mma8452: convert to guard(mutex) Date: Mon, 9 Mar 2026 19:53:50 +0530 Message-ID: <20260309142352.57407-3-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309142352.57407-1-rajveer.chaudhari.linux@gmail.com> References: <20260309142352.57407-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. Aligned headers in alphabatical order. Signed-off-by: Rajveer Chaudhari --- drivers/iio/accel/mma8452.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 15172ba2972c..ae096e618810 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -18,21 +18,24 @@ * TODO: orientation events */ =20 +#include +#include +#include #include #include +#include #include -#include +#include + +#include +#include #include #include -#include #include #include #include -#include -#include -#include + #include -#include =20 #define MMA8452_STATUS 0x00 #define MMA8452_STATUS_DRDY (BIT(2) | BIT(1) | BIT(0)) @@ -597,36 +600,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-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 7953C3B7B6B for ; Mon, 9 Mar 2026 14:24:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066290; cv=none; b=bqkqBFKbKzC7raI9L26oeHYiXlgxnrJrNuZDQZJPs/w4Rry0dRRxAFdwQ6wkutJMiJhgJJlMPU7F3rQXxsz9yQZICYxit2UtTrcT9GS7KdVMNl5j99FQzkuNNqia8h3I0gtwpekAYt4h1Eu4TAcwr5lkZcNyrztIQCENrzXaKzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066290; c=relaxed/simple; bh=OeumYQcWod62VsS2S8b+iZBWRuL6oFtKHJEN73VsxSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fK2IJC6D991fHAWIeBbyjq3rLtxctM+9XE2XuIvvoSdbQ7+9M9rHr5ToFSzig3802ZnxVV0T/h8Lyy2Aj4HdIfaYp+kWuYyqoIr+nVwZk48FSHmHIMuIhNQVqSYEAm1yEikkir3QWgP6xPFKiSXlS6S7rPH7dXdbUG7msrVXIjM= 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=iV6kLA1y; arc=none smtp.client-ip=209.85.216.42 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="iV6kLA1y" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3597df496f6so5054184a91.1 for ; Mon, 09 Mar 2026 07:24:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773066288; x=1773671088; 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=jO6elfLV0A9oqUoZI+t2ZUKkK5BDK6w1X39syVG7a9s=; b=iV6kLA1yZta/nAGnxbfARZh2WeyjqljmgBCOfSZwl50A7KZprNBALqV5QTqGaiLiSg OWivvAQSBDbRlKgruQaga65gSsCvz5JIUbMAtjt4d5s7YQkqlSMq6lq5GZllXaTP1Xhq 9bV8Pvn6OUTNZPMVG0bjgLTdekTRG3BK7qXdv7pzUl61wL/GyEs0wvAoZtDR9Y8IxC+k sZrch88oYqxMCByEj49BDpFI2mA8AByz9YnovELzIbNvAH4XT8s8ZNz51u2w0nWtnbRU QvLkaUGF0jBRWcXvY7jo3REmTCjgJXVD97uNWYaaWzAsWBSwHFOCZAWd5WoCcOyFRzcb mgnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773066288; x=1773671088; 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=jO6elfLV0A9oqUoZI+t2ZUKkK5BDK6w1X39syVG7a9s=; b=nCcCILhNpP1at8fF5OvPMOeZXZEDPpu0KhaofKKGY6OT2CO3kcjtZkKJin9HHb6V1L 1uYJCGvxwEOeUMjLCzYIwvEv5difBItj4s1o7mStJV5RlcZB5EXbQ8I/NjSWb1ASjNO5 Ge7yObvpjJOHKSK7e39w7xLACBudLOLxipr8nhrCPxefCctzJGxJL61NIYKkyDv2hX/2 FMyzOxgbS2g/F91SCI67ODZjPF9+xouKIm69a7O6reRcJGDzYQAAvUHAkl/YXRWj68u0 z8BuIjsVRUwBYaxOryomiDhJa2MasC6gEhJARJ92XV30yL44bl3eFjau+esHJ2qZBtCC CvnA== X-Forwarded-Encrypted: i=1; AJvYcCXX7xoucqlbmf/OFNCqpNlySVxVj/1CC+CBs2b1dhSi9f02Rs/OmDulCR77Cbitz1ghO2eENyVe85fFFj4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxw2EOB6L33p5o28KpAzFqWfAZ15mpYDR+6HnadcVik8c5qAefc dnjkH02TDvRGz9vL0H4kVugayQPUOQYIcBOkIfemWhs+D0C2gTDdaPi4 X-Gm-Gg: ATEYQzzCnCewnCJ94kj+1hQ0INwZOxNvgv7JYmMe50nLjM8sxOnG9p4H8iKFGXqkMws 0JqAI61AF27BhIx7Ngf+BjRG6dEz+cxXayzPpN6m7q/lETmFQoDGt+wgpVD9xybZR2LkECC/YiK mGQRgSCVwNUNY+uvUhD46GbEujBpiNj4KStRnuUTecpLQ2oKE/36Gm515qgKMAAFKNsmCMSOsqK lQjXZ4mz+Iba5t0Wo0C8zN7Ttn+CG984DDpDeLMocGeOQ6XVrTpGFnHY+m/x1D1DnBpQRmkClg3 qhojBQ1A3viZ7u3WagjW0Vp1XHAArvfPBzl0+VHw8GC2YKK/DMSWo22/7IAXqkqh5CLPTedUujZ ycZMebN1yzqf4nd2j5c4EKY8UCZPOthcBpJtFmljebFkF2G+b6eBkpAD26k/oHo8/IvawViEJeq xnWMAeLD8Cs2IQd4pgebbmJniJM5b9YOdgzxeMwXDOXNMacnxbIwILkHnzNPWwB1VQn23ZFvYpA yLeErK9vUmeHzvVkjZJsaxPF69BDvO25iWwZA== X-Received: by 2002:a17:90b:4c0b:b0:340:bfcd:6af8 with SMTP id 98e67ed59e1d1-359be21cbe3mr9605797a91.4.1773066287816; Mon, 09 Mar 2026 07:24:47 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359b2e0e1aasm18985311a91.15.2026.03.09.07.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 07:24:47 -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 3/4] iio: accel: mma9551: convert to guard(mutex) Date: Mon, 9 Mar 2026 19:53:51 +0530 Message-ID: <20260309142352.57407-4-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309142352.57407-1-rajveer.chaudhari.linux@gmail.com> References: <20260309142352.57407-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. Aligned headers in alphabatical order. Signed-off-by: Rajveer Chaudhari --- drivers/iio/accel/mma9551.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 02195deada49..0936b148e424 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -4,17 +4,21 @@ * Copyright (c) 2014, Intel Corporation. */ =20 +#include +#include #include #include #include #include +#include #include -#include + #include + +#include #include #include -#include -#include + #include "mma9551_core.h" =20 #define MMA9551_GPIO_COUNT 4 @@ -337,7 +341,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 +353,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 +377,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 +385,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-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 3303E3B893E for ; Mon, 9 Mar 2026 14:24:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066297; cv=none; b=COzrSqXnqHKVHikgm9DmXIRg+Ef+/rYlciET+CcLFmllXdfH/dO9Q8SX8hA5vm9ueETJP0kp0OjNLwNKGZ6oX4xHyYNAg6uD8VYwcgDLLATmgP2fEZzTAPtzV+WwKCLdywptP74OvRco3yyfAkiV6p7pE0FuQYpzs7+DKfAFVu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773066297; c=relaxed/simple; bh=tYmlw5EJddPO0i/7GhVZcraSQ1Bss/FoOSAoivPvmjw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A5qt6rRZ5JFxNIF5WOz3McAg3YOoZDKq9XiOZtf2KDCxqUddBB5hW/TfGirASVHPixutCJRcwniDfN6BbdsOUbX175ESBpYDYgJd+VeROSPfTSpZX7g7WEUcXGW9JMuvOsnbr1na42mzaK29+J4w3eiGPHtr0xByfmaMnRcxTN0= 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=h/e47GfR; arc=none smtp.client-ip=209.85.216.53 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="h/e47GfR" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3598cab697eso5172796a91.1 for ; Mon, 09 Mar 2026 07:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773066295; x=1773671095; 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=iJhbrAfBpXsuKw1KxcluPw8lwJFwkriN9862ZTb+amQ=; b=h/e47GfRu7HtQlR9/bqGMG+n9sM451AxE3VNTmj6JrgxqUiYafcsu1OE3gQ5Ppdvol HL/riBshk2uuEBZcCOvwHT6b8FYrCPaztQu9DV7UDJ6pZH79lHuTwqd4dw+ZYgVMf2H/ 1Ei7MCntEE6UgHn4W6ZYkKlozRfFMXLegwVbTkNDE1JKtpCT+iLq//CjnYrNXvUEZvWl DZKj1eo/W7QzYsa89Eby/1+eZcYi0sp5oNcUbpNaNMJSZGLOBcWmMzHWYsrX86YDFaPM XVsA86GnHQn6eK6PiZr2gFFoyW5crRCP1D6Yk2Gt5PL0XXouXGVCsH9I2JuiMdwHH9IW aD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773066295; x=1773671095; 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=iJhbrAfBpXsuKw1KxcluPw8lwJFwkriN9862ZTb+amQ=; b=dAKNfrUao2NpWKJmx+nks8bFVTLr5O173BLAjM1tAv04A/7xquvQ0a8aEjy7UCyvqH Cu1YdDwvntHheXfBoo/GPtiNmgIwaEvlqFIoapLhX6He5BjwHJrTNnorSwOKd+HOqYe+ 1MS9CpZuibqC6zU66znx9xHuwyfe+gmP2+JbOtmMfdV6J6Pq2WWbLZmS26OE3hVYmytg dZPQuR029400w9ZGwbYn2b9uTYr2TgvMlqq5SxPwOvm1el+gH7dOFSQi2iNSCSc6ahgO C1UUxFT0/lUJoyRCCCLCJ5Jf1KL7ODqVmNOYcoE9yHOA5Qogm4ErWoQsmPYYW1kRoptZ GAZA== X-Forwarded-Encrypted: i=1; AJvYcCXXV52346EO0TRFk664k3FJCsTuB34U7DW5N6V1cDlGxTPHOsDI0z56os/YSBKYy370619q78j8KdNe0j4=@vger.kernel.org X-Gm-Message-State: AOJu0YzgMJYk+iuOWa7pyXJLmDRAoGZIDnwwxV1Zm+cGIKBEnrQOboJf 5JJNMKXUjntHanxYCs7smInHJUgoXFL7v9Sy4FdlRKt1PSNr55ChLUUn X-Gm-Gg: ATEYQzwgXwRjGU87SMYLUO8hR8TdnzroJQ7pYWaC/KrnJlTFxcgosRUSTw+Whzh3msh A9Exu1fFsS5tEL64fEyzq4PFZa7IWBXMAr5KgxHv9RhLlnzmTDae2t8blspLwP9ynrtb2mTpift tIi8+BYcgzn2Viy3NcZR35ezEtM6rdaQkM6xdITiG80opwtPOwdWk8WZgXu+8ePQW/IM/YQWGsF TgUpXHb1d7QegqTV91OcQbEpTrtVBJI8HxQaFipr7HWhxuIk1HS/3xyMpdPuo8QEFuqwMPDYfsN YKKVus2fFxfsBo+RlcPbmrAKWV8AWGdpi+/WZa97MqOqfMQkTE0YmNOKQqPXRHWVlokTptd0A3K hhLXXT1ZInuzglMN/0IagtfB76JlWMkgf9RX99sYJ10xMB2WVjbk8QdhETsV7DLuoH42V8JM9sv WN+mZxVMMwBnjBVK7fR6+foBlJTPcOvO+kz89yg+z4eEF3d0Cdj6sk1OHL6+khW6nyVwUxpQVfc 9TZXpH9T4zWesBBVMff5GXH7YQ= X-Received: by 2002:a17:90b:48cd:b0:356:21e9:73ff with SMTP id 98e67ed59e1d1-359be354bc7mr8880922a91.11.1773066295430; Mon, 09 Mar 2026 07:24:55 -0700 (PDT) Received: from fedora ([2401:4900:1c80:20f6:77bf:3a75:33cb:748c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359b2e0e1aasm18985311a91.15.2026.03.09.07.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 07:24:54 -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 4/4] iio: accel: sca3000: convert to guard(mutex) Date: Mon, 9 Mar 2026 19:53:52 +0530 Message-ID: <20260309142352.57407-5-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309142352.57407-1-rajveer.chaudhari.linux@gmail.com> References: <20260309142352.57407-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(). This ensures the mutex is released on all return paths and allows returning directly without a goto label. Aligned headers in alphabatical order. Signed-off-by: Rajveer Chaudhari --- drivers/iio/accel/sca3000.c | 115 ++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 63 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index 4a827be439a2..05c91dfbc6ab 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -7,20 +7,23 @@ * See industrialio/accels/sca3000.h for comments. */ =20 -#include -#include +#include #include -#include +#include +#include #include -#include -#include #include +#include +#include #include -#include -#include -#include + #include +#include +#include #include +#include + +#include =20 #define SCA3000_WRITE_REG(a) (((a) << 2) | 0x02) #define SCA3000_READ_REG(a) ((a) << 2) @@ -424,16 +427,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 +999,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 +1015,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 +1028,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 +1113,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 +1137,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 +1146,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 +1277,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 +1292,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 +1310,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 +1336,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 +1364,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 +1391,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 +1409,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 +1494,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