From patchwork Sun Feb 9 18:06:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13967041 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 88A371E0E01 for ; Sun, 9 Feb 2025 18:07:19 +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=1739124440; cv=none; b=MJiaifOa4v9t6WWYw9Lor4I6qmV/1h5PXklDu0hth9700LvHl1NXv5LlOU/qjZ49IixWqA9TtpWfnZfbwIg9LEu1lLesySCeu5GNI4/mBcT0rUR3Z/dOgD2Or5tAybfo1DtFMWU/O6UBm4RWUkdT7f7aa+eQgGJ5QOR5azrkHAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739124440; c=relaxed/simple; bh=yXyP8eoChheH5LttgrfaEdzmbV8A2lU8DQ/z1oGP9V4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=snyVEd6m261wd2eoH1DxcnCDXjMMJiOmfShBuLm45o83gceEg7qbo1y7oRYA4dOx5mDQA+45YBMSbyNIxj3VSumMAsTmGGi1hjCpz60PGKTy9uWDODWv46z8FHmWPJAW7nUMAtB9pMjhYJznQB5GueTOkqsbRbY0jf2yb5J4cWE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=erqfm5s6; 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="erqfm5s6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83959C4CEE5; Sun, 9 Feb 2025 18:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739124439; bh=yXyP8eoChheH5LttgrfaEdzmbV8A2lU8DQ/z1oGP9V4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erqfm5s65A5nZCR4hhIe8x9XVe8alUmgR+u/SQaFAYLrKU1YiI98TNyoB5Y6/uHY0 kZJKopvKGZKXW90qqLbS6yUzuIOgXytxu/eDVJAlQDfX++7bZS0jWC8Nr1e9WUVEUe bKY3bowzgWjN32ZhOLKqzRDi0PDL9AyL1NcSypVj0A4FlbJ+XEumiOcnCL/agNl8FY oSB+3NfCdGqrgmQhlqxBi+e3OVeQw1U4FT19XvjM0iuwFV/DMYYYgMJPpaTfoWfewd FcFDBdYES+uYK9D1xT24i4NWKE2zIAMBDyrUuD9D5OWPiDoLC7a6SlmuC0qThbrwyR kFZHsDE8rlwlQ== 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 v2 05/27] iio: proximity: sx9310: Stop using iio_device_claim_direct_scoped() Date: Sun, 9 Feb 2025 18:06:02 +0000 Message-ID: <20250209180624.701140-6-jic23@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250209180624.701140-1-jic23@kernel.org> References: <20250209180624.701140-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. Reviewed-by: Gwendal Grignou Reviewed-by: David Lechner Signed-off-by: Jonathan Cameron --- drivers/iio/proximity/sx9310.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index 0d7f0518d4fb..b60707eba39d 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -337,19 +337,26 @@ static int sx9310_read_raw(struct iio_dev *indio_dev, int *val2, long mask) { struct sx_common_data *data = iio_priv(indio_dev); + int ret; if (chan->type != IIO_PROXIMITY) return -EINVAL; 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 sx9310_read_gain(data, chan, val); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret = sx9310_read_gain(data, chan, val); + iio_device_release_direct(indio_dev); + return ret; case IIO_CHAN_INFO_SAMP_FREQ: return sx9310_read_samp_freq(data, val, val2); default: