From patchwork Mon Feb 17 14:16:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 13977953 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 DBBCF21D5BF for ; Mon, 17 Feb 2025 14:18:47 +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=1739801927; cv=none; b=J24LJ/nyNvt4FGhHyu8zFfWyf+EVQZzyZhyCL9wmS9vlwqDZFK5cqbrf50BaXRR+DQmbfvGj+HswaMRm5FKQBt0zvoNFo6xGrmvnd/ZwXBCi+wZu85BOCDiZpxOzfd9WjwEO5dwzaC+6xmkytNriEfLbZkGxISaXRrm60MG9Dys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801927; c=relaxed/simple; bh=BRqVFy02hcCLoHII0OjVK/AIjoqIVapILIqhErLJdXA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jzyVBnEuDS1VyjQnx6zOpM1JgbeAPeCDDrTMVXwWrkR5YCUkT2cMzebtOwOgZ6tIQ1RUJqFiIiesfHolXzEw3NnmCDAtgg/pyd0pALa/z2MSEc87C7S+VxypeatlurcZ6Cz3p0bYJ843MQzx1iXRYcR22xmNU7DPRUysqh6I6HM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l0YpIQLn; 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="l0YpIQLn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78300C4CED1; Mon, 17 Feb 2025 14:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739801927; bh=BRqVFy02hcCLoHII0OjVK/AIjoqIVapILIqhErLJdXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0YpIQLnFXTw1BdLLxhxz/xJneg9/CPoppeW/ukv/CmWDCTUz3c9ZQtG5C4jUd6VG mvL71qZbOBy8GvQl22+nz5n1c09PSwBIZ1bRQF4Uchr2kReJa+KEDIPNIF+vamYfeM lwUfyGXAGcfovOLJfO8cAu2UsZUUXKgwcPlS39LvsvUcDUgBKmqDs+e3WU5YB/1lLa D/LNduUDKvgMslLJUs7nc2d4Zuc3mNzNeGMID4aTVP9ZF4zk/fhYC5OPEhpCAlwa5k y+ujT9mEMnh1XeP72O+n9d6sVCKHRAxDa0Y5Go7Eg7Bc0ThEbqGMOAz9f4OLPq5mYc BWjTbskhGNXuw== From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Olivier Moysan , Mike Looijmans , Phil Reid , Marek Vasut , Miquel Raynal , Claudiu Beznea , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Alisa-Dariana Roman , Marek Vasut , Frank Li , Jonathan Cameron Subject: [PATCH 21/29] iio: adc: at91-sama5d2: Move claim of direct mode up a level and use guard() Date: Mon, 17 Feb 2025 14:16:21 +0000 Message-ID: <20250217141630.897334-22-jic23@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250217141630.897334-1-jic23@kernel.org> References: <20250217141630.897334-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 Move iio_device_claim_direct_mode() up one layer in the call stack, and use guard() for scope based unlocking to simplify error handling by allowing direct returns. Signed-off-by: Jonathan Cameron Cc: Claudiu Beznea Reviewed-by: Claudiu Beznea --- drivers/iio/adc/at91-sama5d2_adc.c | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index 8e5aaf15a921..70d3dbb39b25 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -1814,19 +1815,10 @@ static int at91_adc_read_info_locked(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val) { struct at91_adc_state *st = iio_priv(indio_dev); - int ret; - - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - - mutex_lock(&st->lock); - ret = at91_adc_read_info_raw(indio_dev, chan, val); - mutex_unlock(&st->lock); - iio_device_release_direct_mode(indio_dev); + guard(mutex)(&st->lock); - return ret; + return at91_adc_read_info_raw(indio_dev, chan, val); } static void at91_adc_temp_sensor_configure(struct at91_adc_state *st, @@ -1871,14 +1863,11 @@ static int at91_adc_read_temp(struct iio_dev *indio_dev, u32 tmp; int ret, vbg, vtemp; - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret = pm_runtime_resume_and_get(st->dev); if (ret < 0) - goto unlock; + return ret; at91_adc_temp_sensor_configure(st, true); @@ -1900,9 +1889,6 @@ static int at91_adc_read_temp(struct iio_dev *indio_dev, at91_adc_temp_sensor_configure(st, false); pm_runtime_mark_last_busy(st->dev); pm_runtime_put_autosuspend(st->dev); -unlock: - mutex_unlock(&st->lock); - iio_device_release_direct_mode(indio_dev); if (ret < 0) return ret; @@ -1924,10 +1910,17 @@ static int at91_adc_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct at91_adc_state *st = iio_priv(indio_dev); + int ret; switch (mask) { case IIO_CHAN_INFO_RAW: - return at91_adc_read_info_locked(indio_dev, chan, val); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + ret = at91_adc_read_info_locked(indio_dev, chan, val); + iio_device_release_direct_mode(indio_dev); + return ret; case IIO_CHAN_INFO_SCALE: *val = st->vref_uv / 1000; @@ -1939,7 +1932,14 @@ static int at91_adc_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_PROCESSED: if (chan->type != IIO_TEMP) return -EINVAL; - return at91_adc_read_temp(indio_dev, chan, val); + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + ret = at91_adc_read_temp(indio_dev, chan, val); + iio_device_release_direct_mode(indio_dev); + + return ret; case IIO_CHAN_INFO_SAMP_FREQ: *val = at91_adc_get_sample_freq(st);