From patchwork Sun Feb 9 18:06:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13967062 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 64E851E0E13 for ; Sun, 9 Feb 2025 18:09:33 +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=1739124573; cv=none; b=GAdggfrAC7XHyFCA4Na3wo2JuLxyVWHTWvYuMjdthDq7QDy8DaEJ58V47aNFOCI3u/xVre4PLw/lpgaFHkRsAhvnAKKqlyHaKS9g3uSopHvurN44eNsJeB4PL62++l+djrNtkSisaYSF0ESF56piVtaCSAts3AF71/HUU/wELIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739124573; c=relaxed/simple; bh=HbzHUSWGqEwHmxnERyrztbXeNCSzu/58kFPxC6FdP3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qootLo/TYfVZkycMPyvAIYs5c8ZBkug6Jp70qh6CPVvGQl5BTx/00gqWG7kf8xr/qe/GOfM+jocOh3OyWDsQ+WKUxas7LXP2ZXSz7orrSUd1i70dc2arunzH49BVORH5IoyUlE8ECt5wq8wqyYPesBl+uH3/aQBThsHse63Wvg8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ejoSWlTm; 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="ejoSWlTm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7AFFC4CEDD; Sun, 9 Feb 2025 18:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739124573; bh=HbzHUSWGqEwHmxnERyrztbXeNCSzu/58kFPxC6FdP3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejoSWlTmb16BpEbWlC96Nl6LbL4n+p57IRL2r0GspjXKsy5bJ22XT8JhmSsaGIJsZ UVElIhKNMXR8Hex2Kj1Cs3AdtLV6NHzYre4+YqVdk38+MOAkbd/nrySKxrHzvK76iM H3HdbARkyQF0LLYMQD1CAx+3zVlGGfoASfiyvwEOGbAkgjeAsqgxRCzVpN1xKZdqZc /UQkW8dn3Zn/4iGbfouS8WTAjVQMdqP0MoXvWFdq1BdA913ay0kZMngT96Ag1Jlj6H ZGCPbh0mZCXaftqEoC7YZ0UkS/GnOSJSdissoqBfMfp6DbeiQw9rIYxeLZrqHIlO09 phTntwqSg4l1A== 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 23/27] iio: dac: ad8460: Stop using iio_device_claim_direct_scoped() Date: Sun, 9 Feb 2025 18:06:20 +0000 Message-ID: <20250209180624.701140-24-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. Cc: Mariel Tinaco Reviewed-by: David Lechner Signed-off-by: Jonathan Cameron Reviewed-by: Nuno Sa --- drivers/iio/dac/ad8460.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/iio/dac/ad8460.c b/drivers/iio/dac/ad8460.c index 535ee3105af6..6e45686902dd 100644 --- a/drivers/iio/dac/ad8460.c +++ b/drivers/iio/dac/ad8460.c @@ -264,9 +264,12 @@ static ssize_t ad8460_write_toggle_en(struct iio_dev *indio_dev, uintptr_t priva if (ret) return ret; - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) - return ad8460_enable_apg_mode(state, toggle_en); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret = ad8460_enable_apg_mode(state, toggle_en); + iio_device_release_direct(indio_dev); + return ret; } static ssize_t ad8460_read_powerdown(struct iio_dev *indio_dev, uintptr_t private, @@ -421,14 +424,17 @@ static int ad8460_write_raw(struct iio_dev *indio_dev, long mask) { struct ad8460_state *state = iio_priv(indio_dev); + int ret; switch (mask) { case IIO_CHAN_INFO_RAW: switch (chan->type) { case IIO_VOLTAGE: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) - return ad8460_set_sample(state, val); - unreachable(); + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + ret = ad8460_set_sample(state, val); + iio_device_release_direct(indio_dev); + return ret; case IIO_CURRENT: return regmap_write(state->regmap, AD8460_CTRL_REG(0x04), FIELD_PREP(AD8460_QUIESCENT_CURRENT_MSK, val));