From nobody Tue Apr 7 09:17:53 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 5EBFE326938 for ; Sat, 14 Mar 2026 17:07:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773508029; cv=none; b=aRY3t0RSrYWoQ77ZP2w9hKtbCN9q6nnqJ7RLT+FJamT+t/sP6hXvGhxaXCBkEwoVZQR7GmJ+SOYSAFzLJC0DbgGAudPuAdHdbTWQ0+Bu5QbgUTv9CBk5bcc0+nYJMw9ORfZfj9N9aTeVzJcE06A+CIqN8sl4a8tmmkFm3FWooKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773508029; c=relaxed/simple; bh=HmPTsqb/9N1Z/ajgv8obZI9UP3kG09bBiRK3FZTbKPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cae3Bsj+Rx7TuVk0+9KIr5bzvh/um0tH05Kuo+B6vsoyOMdzQ70+a/ox89pm9DToTE0LmKojjSAf2fE2z4oVOw4vrfPohcUO9dXSt8sVOXxAHXAkYY/6jnQk33izrB7pvMXI327XGBG930tOnkCJ3AbyiTuR3aGuqH1/ZHKBCOk= 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=gaGEp5yE; arc=none smtp.client-ip=209.85.216.49 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="gaGEp5yE" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-354a18c48b5so3187257a91.1 for ; Sat, 14 Mar 2026 10:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773508028; x=1774112828; 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=cXBXAYup5bMGRbC7TQhDOWWRHU3wjPm9XP+UjoBzfnM=; b=gaGEp5yEA+TBSMUREIndaKUfhOzviMu4ecd9EDZi7NTK3qoqAFhBkr5QfLxRQWYomT rJgkzSEhx109TprHgaQgmZSixazGF/XkO0A3dH4+ocr43z9LPONj1AIz5p8GxrtHIRH8 kbZWMXNeBzJmu1A4+cn8BSANWc8SOEBKf2ehKmsgJdrXZB5DZdc3RORpuMC4cLUvZUad d5w9WSfODwHpDbRvZyltn9nUPA7Y/7q3MSVgob8/AS9s/beMnUXLs9lNDN2bgyBOutVr gHAnDUx8yIUtlbIfR+KmfPnatcTDpKWufde0T0Xwov7iHAh1CjMkWL12ccMC3QDTREbL EHZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773508028; x=1774112828; 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=cXBXAYup5bMGRbC7TQhDOWWRHU3wjPm9XP+UjoBzfnM=; b=aCCBRdhjHevpHkCJIo9hm63CQOWxxMnj9HZvozdX7itdh0bzMbg8M0dN7SFgYiJPr+ lqfEZy2suwAStS1CiBevNx0UZDjQrMKhTeF0WW6mzGkqTnzUZEDNT1VQMuNwyhm8pvGj 2/Pxmp9OZWFOGJOHf6CDYND32rtj2p3TurTRuO4y/M1A6RONU8AEtN0trXMdFDhnCUf3 +PpnTZqz2W66mI8rXxuhmbZi1B+11ynjYubbD5di6r1lpcoMI80A5EqCmAAnWKgbHSx5 TEuuhDTpYvQBB4Yjmj6FdueXDy4aZ2WG5Z7LNHw5OUiE6HT6UoaVO7fsziOTB/gw7RET p3NQ== X-Forwarded-Encrypted: i=1; AJvYcCUimEnj4QODy4hGK5InpXiGVSTEOEmGjJRwdm1PiP+0Jx+NcdasXmpZngWru/Li8OX4cvW/FNw1qYnRMtE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz36pFKtV02HHa+4tEviSQEPQq/G/X5qtFP+Yu9qhkcix9w7yjZ uEWXLdmxT3T+l0HhNs5Xb7arkyMHWV1LNMh38rcW9pZabVxtI2axoJJ3 X-Gm-Gg: ATEYQzzIgG3bJGt8OZlKWZLDPldjCrP6DmV5mdqb39IM75DIJL7ZUBA6bvQ1H0pva7n QpUPuvWvIqyLqbfL2RoqxGPRrdgRETSDmN1rBr9IYNwqvq29dIZaD0to2oRPacOvZ6q83b3g53Y EDwaZapAvva82fMef+svPZpzRUY6+LAiOLgPDqxirPfrnbCP2s2fCtGqM9VDeGAJAuBvU04dUfW CpRVBuR4fAHVHZYHp/Re6SsKY8OmS47tjxL+Ya1A15GLJIjuFyfrn0txyhw9Ry1PFSORdtz2dig ellohHwj9uMU0+5vdPQuke6PedoovsRks//EIPAP9vIC5/qzdfC58Xq/HNNnhpjrqehgVACcfMU XjOhw/Bp8YrW01UvPmPsrheTj4jR89xTzCN1Be4/XLym5RUobfidevnbETk5DDv1tZzAlBQO1LU wyptQLhjkYZsEeheCUep1+pWFWlOekdgY9cniDLdJrWveXAv+EBhKrnjR91hCjvfghL48brSX7h /4SVyv4pMo8u8MLI9eu35IpP2g= X-Received: by 2002:a17:90b:3c10:b0:359:92b5:da70 with SMTP id 98e67ed59e1d1-35a21ed3a60mr6694324a91.9.1773508027792; Sat, 14 Mar 2026 10:07:07 -0700 (PDT) Received: from fedora ([2401:4900:8898:a35f:15b4:3058:14c8:4287]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35b90d3f572sm1600116a91.14.2026.03.14.10.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2026 10:07:07 -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 v4 2/8] iio: accel: bmc150: convert to guard(mutex) Date: Sat, 14 Mar 2026 22:36:03 +0530 Message-ID: <20260314170609.26827-3-rajveer.chaudhari.linux@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260314170609.26827-1-rajveer.chaudhari.linux@gmail.com> References: <20260314170609.26827-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 Reviewed-by: Linus Walleij --- v4: No changes 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 | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc1= 50-accel-core.c index 4eb4293a741d..d3214be54819 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -1483,20 +1483,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 @@ -1505,12 +1505,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) @@ -1520,19 +1518,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