From nobody Thu Apr 9 12:00:47 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