From patchwork Tue Feb 4 20:02:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13959760 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AE2514B094 for ; Tue, 4 Feb 2025 20:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738699412; cv=none; b=p+cHwEuxHc31poVG4oyTGxrybHWPwum+F5sUlbA7yRDOZrUqpnnx9MV8AUr1PV8Y28Nv9AWxjdP2wraomcAV+I0268tvnCnnMS+33uoBhDgS9uY8T9cYNPdpwKD8LYRWvZk6LAZpSROF0QYKThMuJNZrD54hkk1XQ7z92e6Hbd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738699412; c=relaxed/simple; bh=bI9IJB3nieW8XS1BBdqTBl3IRvqhP07gqqzbGKME3sA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sMVvgKc4PjUxLEgo8WuUN2HHNcE3Z7fl/C3v3ySL2tab4Oel3mcSmGSFS2FAtJ6rXYcxwA8rSYwOcSAn/VAzz53/GFZTKlPdubvEuhKVGC8YJ7JxJK44aqsXW2oVAi88B5w7f4mm8HNAKLnESLa/ZXwDKFQi79ZiubeyilnHJmA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ssZW+F4w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ssZW+F4w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF68DC4CEE2; Tue, 4 Feb 2025 20:03:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738699412; bh=bI9IJB3nieW8XS1BBdqTBl3IRvqhP07gqqzbGKME3sA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssZW+F4wZkKCK0vpI9e3b3r3yJXoIh/6qBQFn7DHC7zifPA11gJ7gfQa6Kk2VxIfY MyQYg+j0iI4nEwkWNVHJFngeJVBtBXQte+Udj84lSiGeOfqVpZNYkbY7+8zPirwAfw yfYhoYLXYKcVsId+z+ytzwFoTZxYHxUa1V7j4xeGq7KOBqBAUStm6niXeCO+vHKKX8 545j6FkFdlYAnz+pz3OICU9RSY5kfAhUXmiJW4CevfaT1CbZXuI94HbrrbAnJYjnV/ qt/3EkS5ij0L20DKGEyBQECDHP/vkVggkzXHCk0loWidlkCt6IxRbXXox4p/XrocQ5 Ero/XWFNpp4jA== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Mudit Sharma , Julien Stephan , Mariel Tinaco , Angelo Dureghello , Gustavo Silva , Nuno Sa , =?utf-8?q?Jo=C3=A3o_Paulo_Gon=C3=A7alves?= , ChiYuan Huang , Ramona Alexandra Nechita , Trevor Gamblin , Guillaume Stols , David Lechner , Cosmin Tanislav , Marcelo Schmitt , Gwendal Grignou , Antoni Pokusinski , Tomasz Duszynski , Jonathan Cameron Subject: [PATCH 06/27] iio: proximity: sx9324: Stop using iio_device_claim_direct_scoped() Date: Tue, 4 Feb 2025 20:02:28 +0000 Message-ID: <20250204200250.636721-7-jic23@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250204200250.636721-1-jic23@kernel.org> References: <20250204200250.636721-1-jic23@kernel.org> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Jonathan Cameron This complex cleanup.h use case of conditional guards has proved to be more trouble that it is worth in terms of false positive compiler warnings and hard to read code. Move directly to the new claim/release_direct() that allow sparse to check for unbalanced context Signed-off-by: Jonathan Cameron Cc: Gwendal Grignou --- drivers/iio/proximity/sx9324.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/iio/proximity/sx9324.c b/drivers/iio/proximity/sx9324.c index f7819dd2775c..73d972416c01 100644 --- a/drivers/iio/proximity/sx9324.c +++ b/drivers/iio/proximity/sx9324.c @@ -429,16 +429,23 @@ static int sx9324_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct sx_common_data *data = iio_priv(indio_dev); + int ret; switch (mask) { case IIO_CHAN_INFO_RAW: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) - return sx_common_read_proximity(data, chan, val); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret = sx_common_read_proximity(data, chan, val); + iio_device_release_direct(indio_dev); + return ret; case IIO_CHAN_INFO_HARDWAREGAIN: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) - return sx9324_read_gain(data, chan, val); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret = sx9324_read_gain(data, chan, val); + iio_device_release_direct(indio_dev); + return ret; case IIO_CHAN_INFO_SAMP_FREQ: return sx9324_read_samp_freq(data, val, val2); default: