From patchwork Tue Feb 4 20:02:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13959801 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 47B2E2040A8 for ; Tue, 4 Feb 2025 20:05:17 +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=1738699518; cv=none; b=l8UFQHKpdDpR8fG38NTaD3iPjyUxYbaYSWFSlH3X61YGbYBigNhM6BEIereCwayf8KksBse4bHAiVdtJkMrTXkUiTn5gxxN6AuOZ6H+XvMzva7UGOaOYqrOLDQvsbxAx6McZNBXA8P/tdrtz0wo8dk8zzpjzj9ygUykyDYCuTrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738699518; c=relaxed/simple; bh=nTDvAiR+VPxLXANH/DY0hOcnWcZs8ukFjSZU4w2M5H4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TKLsrr80PihiUJqLLemY9DL68agP/m4AlNhjczEtVngwdnZTXN6aAkrapLI188c1vyros/h7fL54A6sBfHPPPT6cRPQdyU2jaIRbVY556yxwwRSeOBe/OIErkh2bb33aGsLW44Xfjd8A8IbOOubZwnobFAcZbnWmyB2P2KS/ZQs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SOtt8+3v; 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="SOtt8+3v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ADA4C4CEE2; Tue, 4 Feb 2025 20:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738699517; bh=nTDvAiR+VPxLXANH/DY0hOcnWcZs8ukFjSZU4w2M5H4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SOtt8+3v7CCmVS0Fj5hgMKcd5TDqYFcAQ/qH93FioERQYSzPedFUGYk9bp8F/9eEh llsHFfF9gtQFrjwJwDYT3TurEhQSHXCrWXkpIDw5bMw/TdeYKrSkhHvGondXgXcGGt Jg8uGgKnMcxozAjXfRI4eTRQS3+Swytfzfnxl+OKMlBnr3crv9IOVN3k2A3SZVAuhi WMPqMlsu4V29qkbf9JW3qUXcjnHNw8Az3WNElwK0sBrJwb5xIQizRxMYAwAV914lL4 5UCvobkJJ0Cw1Z5JGfsDWLv3Q57K1yL5jYOJsbv6Ef8dTe5U7AcBw2duUKdQimoLdG Qj9Wy1a29mwEA== 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 26/27] iio: light: bh1745: Stop using iio_device_claim_direct_scoped() Date: Tue, 4 Feb 2025 20:02:48 +0000 Message-ID: <20250204200250.636721-27-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: Mudit Sharma --- drivers/iio/light/bh1745.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/iio/light/bh1745.c b/drivers/iio/light/bh1745.c index 3b4056be54a0..56ab5fe90ff9 100644 --- a/drivers/iio/light/bh1745.c +++ b/drivers/iio/light/bh1745.c @@ -426,16 +426,16 @@ static int bh1745_read_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_RAW: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { - ret = regmap_bulk_read(data->regmap, chan->address, - &value, 2); - if (ret) - return ret; - *val = value; + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; - return IIO_VAL_INT; - } - unreachable(); + ret = regmap_bulk_read(data->regmap, chan->address, &value, 2); + iio_device_release_direct(indio_dev); + if (ret) + return ret; + *val = value; + + return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: { guard(mutex)(&data->lock);