From patchwork Sun Feb 9 18:06:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13967049 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 C8D621E04B9 for ; Sun, 9 Feb 2025 18:08: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=1739124499; cv=none; b=fEIbTcv3Gz9o/9ts9BAhEvrmuW+yR8BKiD+10BuXp/33az91fT50uTCsgdwbwmW4+78iyGu9UDu1hq+vBzQHzqWg/DtTWy6XAIatOS0kOT+UVyrVOowDG8TeJ5WQk/M59o9HYGvAa9PdQsSJdUEYEjXDqdEa2cP9Rmx/8dEzzpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739124499; c=relaxed/simple; bh=LwIB0QjFiFttqsmzzseL4XqgAFsdKiLMYtEI0rnsli4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WB0+aT3H6P5iHkc6XKHRWcZRwZuII74y8qFYC2wb9Kw0Bx3aAn/T6ohgHGYaFAWX2Lyhv8TvxIVzMuxIcvMdKu0RgfJRSXtY0S/Rs8McqFnNW+hzGxdBYrtVR7ksZwuE3IJKzIpG+jIv3C+b0pFwBWuEaz7aCgTnQTT4mlCz0H8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=khl3bvyO; 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="khl3bvyO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 527D8C4CEDD; Sun, 9 Feb 2025 18:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739124499; bh=LwIB0QjFiFttqsmzzseL4XqgAFsdKiLMYtEI0rnsli4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=khl3bvyOsTgr//1j2NkEC/YcUUBn6vZ9YqRy9ba6uaOu1CCsoa7jt3pQVvWDMyymg hWXIUYYOfyztlMv8UcI8TsLTU4WazOlt7oo9jmvyjFNUdb2RSkYldDKZRi00vq4ikv xdJ3TRJK4fbBaUc/OIi55T7giEjkkEvvV9kWI8sz9pjZRcY4i+zuY54gaUL5m1/6V1 rQOr+SdHopnWe9XR3WrlDiqerXhx9Wuljw2ZDvCk4dr/pUfXtCL1G9H4hYlmrWCZXf xgpFahvN3WC/Y9zV3x5x0lIPWKuLvdNWvIHGU5tafyJRh91TG9zczP+JmIDN3Rmew3 6cjX18OuWjnUg== 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 13/27] iio: adc: ad7625: Stop using iio_device_claim_direct_scoped() Date: Sun, 9 Feb 2025 18:06:10 +0000 Message-ID: <20250209180624.701140-14-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: Trevor Gamblin Reviewed-by: David Lechner Signed-off-by: Jonathan Cameron Reviewed-by: Nuno Sa --- drivers/iio/adc/ad7625.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iio/adc/ad7625.c b/drivers/iio/adc/ad7625.c index adb4e25dd7ea..0466c0c7eae4 100644 --- a/drivers/iio/adc/ad7625.c +++ b/drivers/iio/adc/ad7625.c @@ -248,12 +248,15 @@ static int ad7625_write_raw(struct iio_dev *indio_dev, int val, int val2, long info) { struct ad7625_state *st = iio_priv(indio_dev); + int ret; switch (info) { case IIO_CHAN_INFO_SAMP_FREQ: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) - return ad7625_set_sampling_freq(st, val); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + ret = ad7625_set_sampling_freq(st, val); + iio_device_release_direct(indio_dev); + return ret; default: return -EINVAL; }