From nobody Sun Feb 8 14:51:59 2026 Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9B1F36E470 for ; Tue, 20 Jan 2026 06:21:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768890081; cv=none; b=hHGvHM75NmCWv/TLcsr0H+TMOcNDIvb+e9cY0URCI0sc0j5QeQJjZWGU40OZvRfWEZXUr0NfC3MpGkUj8i3SzRKG3MTqwQlJhpHnBYGQnDn41031NGDgr8MKuXy3drJ7biEhEaaqLElpfJjPN9U16HRXhzMTHVFO3uMKfMLQ+E8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768890081; c=relaxed/simple; bh=JrWulgb5grSFMVK1z6odZB7wWOSYuUBdIJG44+bjR30=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tCOUZHOU6GsWwKhckw9TbbkRXQyFMxyIHo0Ifh3UCje1E/1Ze51BAr0A87p3oHwDzWdNvk8ow7ywVcMeHphuWrmEbHy4lOemP4PNODWNidj4sT5Xnmm854+JDtch9EDq2Nzs6dAspWG/QjuUgRU8obEx/2nDaloGbLTIuKw3HLI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lbTaHZcG; arc=none smtp.client-ip=209.85.222.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lbTaHZcG" Received: by mail-ua1-f53.google.com with SMTP id a1e0cc1a2514c-93a9f700a8cso1274316241.2 for ; Mon, 19 Jan 2026 22:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768890078; x=1769494878; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NLMTng3flPO+eq1heKg9qmQSNnEZhgCKKq6nL/z8Gzc=; b=lbTaHZcGqpwjVCmsEuka2Wq/nJP1T/ppzvUgHmpavU0X2r9b5AK2degoxw8XvB3/jx xwIcB3KMFdekMU7VO2sXoZJr7gGh1OmbIDfXp8MM9KfLe4fRfC8o4VWDHUvycYoUOzpX E8iX+CdAoUaC05ORn4FMM+UnaEmkfYy7KrIGVyKSPUWTz5oRmPooaktQb8Vgg+wzhMF8 M5zb2T+rEwAyKZrW5+oa0HJ4oF1/bpFYlNKLcn9hxnEmZ+wh08JyzH2vOjZHch+pWfAP B2osWhKc2KzGYVol5Up2qFWEynViwF5t839ms12nNFnRZTo8yxJxdvqAhPOW/+qNWgXx lvTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768890078; x=1769494878; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NLMTng3flPO+eq1heKg9qmQSNnEZhgCKKq6nL/z8Gzc=; b=sbbMOzkyNlvTAd5z39ylMR5S1HE0WnZuN6kSJLHOJTHKgF10M0/80ztWMl6LmN5HpK 8h7KKoI6F2n8l1dQMPvizuleUXzFAp2Hdc5y+5ryisC+CyW7+PHH2iRmgTX5owMCrE1a Krqf0YwbefpWoIqlK+4ubTlU9Y5+XrQcOVC0NhJvOSm2PV0rvRlmL5xaRBuhFbpLmjGX 6JeKgJGYh8kB1lJVhDrj8Vjnl870LhvsxdHJ4WRCJdfP3UpLxdxBC61jjSyVv9Gd+SFt mlZWSDrXz3h0TBPXQeFtPlr3LbD1oy7wY152vnENiFV7ZGaVF77lYm6JOBTZtZnlvuDz SZAw== X-Forwarded-Encrypted: i=1; AJvYcCWmdEtvax19RlabZc8bLgsxlXR4rpD74v7kKUBHxgiblrM2hOJ6wBdmZT1WJ0vYEHUoyPGA2eABU6nwCBE=@vger.kernel.org X-Gm-Message-State: AOJu0Yxeu+aUtlWvWJCJ7XC8+zZziM//Cf63ka09pxFyqdVZU/aopi6k /2OKF0TkOXbFLft9y9fawbrZsDtRoPZIBAnknF5I+QsPW3CTd3vRp09J X-Gm-Gg: AZuq6aLzlF9BDP6OLnS903TMUO4TlJPQYJcGXmO8IyUnFHcJKP5n2Xj2oYj7bbR/muc eXZF6YJx88/KiPh9+RUeQStoy1Z8y0bXNtzTYfg8vv0PEmbETtRI9IOKanyxWr+nFsX8WBrgyCt hT3cuecD5kUA+gIDBSJ40Ap9T06834fUk1Yfh6YebyK9bs9BsK4C9zfLX4gwMYSRJXa3eVc9yo9 sjZMVsd/FdGbjf6jf4DZQN/6wIKX+gL49UB9YQ7hBQPq7oHqcQeZE3GYa7JXBTledJFwjnFD+e7 G7zoONpoEAaQvp5K9ko6U7JxyWs4drdkZ4mx6cGJ9jxBiFcix1tc9dOZMxjBU4RAMF05Tx5JiPe 1RpKfya4WDlYGxmIYbRrwcmSW7ZuKuObTwtPF/1l9u5FE8buqjT5XprxFHH8LcopPwo3dnJPmmk QvwK5yTaQGaDT+ X-Received: by 2002:a05:6102:d92:b0:5ef:6709:4738 with SMTP id ada2fe7eead31-5f50ae44e0bmr212536137.30.1768890077616; Mon, 19 Jan 2026 22:21:17 -0800 (PST) Received: from [192.168.100.253] ([2800:bf0:82:11a2:7ac4:1f2:947b:2b6]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-5f1a6900c1esm4057944137.3.2026.01.19.22.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 22:21:17 -0800 (PST) From: Kurt Borja Date: Tue, 20 Jan 2026 01:20:43 -0500 Subject: [PATCH v5 3/7] iio: core: Match iio_device_claim_*() semantics and implementation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260120-lock-impr-v5-3-d4d22347041f@gmail.com> References: <20260120-lock-impr-v5-0-d4d22347041f@gmail.com> In-Reply-To: <20260120-lock-impr-v5-0-d4d22347041f@gmail.com> To: Andy Shevchenko , Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Benson Leung , Antoniu Miclaus , Gwendal Grignou , Shrikant Raskar , Per-Daniel Olsson Cc: David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Guenter Roeck , Jonathan Cameron , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev, Kurt Borja X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=7973; i=kuurtb@gmail.com; h=from:subject:message-id; bh=JrWulgb5grSFMVK1z6odZB7wWOSYuUBdIJG44+bjR30=; b=owGbwMvMwCUmluBs8WX+lTTG02pJDJn5cpfPF6fGflh4ZLVF60+WZ0d2JFe53Lj1jWlKoURQz LpXv123dZSyMIhxMciKKbK0Jyz69igq763fgdD7MHNYmUCGMHBxCsBE/KMY/kqxM92esy1mUmah uxXHfyaLprqCRbEpS/13PkzU6VY+UcbI0Ho1fGXLnYMb30+9qVVv+G2iBUtwYGTh5v4uFwbHK/8 MWAA= X-Developer-Key: i=kuurtb@gmail.com; a=openpgp; fpr=54D3BE170AEF777983C3C63B57E3B6585920A69A Implement iio_device_claim_buffer_mode() fully inline with the use of __iio_dev_mode_lock(), which takes care of sparse annotations. To completely match iio_device_claim_direct() semantics, we need to also change iio_device_claim_buffer_mode() return semantics to usual true/false conditional lock semantics. Additionally, to avoid silently breaking out-of-tree drivers, rename iio_device_claim_buffer_mode() to iio_device_claim_try_buffer_mode(). Reviewed-by: David Lechner Reviewed-by: Nuno S=C3=A1 Signed-off-by: Kurt Borja --- drivers/iio/adc/ade9000.c | 2 +- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +-- drivers/iio/health/max30100.c | 8 +---- drivers/iio/health/max30102.c | 2 +- drivers/iio/industrialio-core.c | 42 +-----------------= ---- drivers/iio/light/opt4060.c | 2 +- include/linux/iio/iio.h | 35 ++++++++++++++++-- 7 files changed, 39 insertions(+), 57 deletions(-) diff --git a/drivers/iio/adc/ade9000.c b/drivers/iio/adc/ade9000.c index 2de8a718d62a..db085dc5e526 100644 --- a/drivers/iio/adc/ade9000.c +++ b/drivers/iio/adc/ade9000.c @@ -964,7 +964,7 @@ static irqreturn_t ade9000_dready_thread(int irq, void = *data) struct iio_dev *indio_dev =3D data; =20 /* Handle data ready interrupt from C4/EVENT/DREADY pin */ - if (!iio_device_claim_buffer_mode(indio_dev)) { + if (iio_device_try_claim_buffer_mode(indio_dev)) { ade9000_iio_push_buffer(indio_dev); iio_device_release_buffer_mode(indio_dev); } diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/dr= ivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c index 9ac80e4b7d75..ef53066b1735 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c @@ -188,11 +188,8 @@ int cros_ec_sensors_push_data(struct iio_dev *indio_de= v, /* * Ignore samples if the buffer is not set: it is needed if the ODR is * set but the buffer is not enabled yet. - * - * Note: iio_device_claim_buffer_mode() returns -EBUSY if the buffer - * is not enabled. */ - if (iio_device_claim_buffer_mode(indio_dev) < 0) + if (!iio_device_try_claim_buffer_mode(indio_dev)) return 0; =20 out =3D (s16 *)st->samples; diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c index 3d441013893c..7dfdb5eb305e 100644 --- a/drivers/iio/health/max30100.c +++ b/drivers/iio/health/max30100.c @@ -417,13 +417,7 @@ static int max30100_read_raw(struct iio_dev *indio_dev, * Temperature reading can only be acquired while engine * is running */ - if (iio_device_claim_buffer_mode(indio_dev)) { - /* - * Replacing -EBUSY or other error code - * returned by iio_device_claim_buffer_mode() - * because user space may rely on the current - * one. - */ + if (!iio_device_try_claim_buffer_mode(indio_dev)) { ret =3D -EAGAIN; } else { ret =3D max30100_get_temp(data, val); diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c index a48c0881a4c7..6918fcb5de2b 100644 --- a/drivers/iio/health/max30102.c +++ b/drivers/iio/health/max30102.c @@ -476,7 +476,7 @@ static int max30102_read_raw(struct iio_dev *indio_dev, * shutdown; leave shutdown briefly when buffer not running */ any_mode_retry: - if (iio_device_claim_buffer_mode(indio_dev)) { + if (!iio_device_try_claim_buffer_mode(indio_dev)) { /* * This one is a *bit* hacky. If we cannot claim buffer * mode, then try direct mode so that we make sure diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-cor= e.c index 0f8e3aa98b72..3115d59c1372 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -2183,7 +2183,7 @@ EXPORT_SYMBOL_GPL(__devm_iio_device_register); * * There are very few cases where a driver actually needs to lock the curr= ent * mode unconditionally. It's recommended to use iio_device_claim_direct()= or - * iio_device_claim_buffer_mode() pairs or related helpers instead. + * iio_device_try_claim_buffer_mode() pairs or related helpers instead. */ void __iio_dev_mode_lock(struct iio_dev *indio_dev) { @@ -2201,46 +2201,6 @@ void __iio_dev_mode_unlock(struct iio_dev *indio_dev) } EXPORT_SYMBOL_GPL(__iio_dev_mode_unlock); =20 -/** - * iio_device_claim_buffer_mode - Keep device in buffer mode - * @indio_dev: the iio_dev associated with the device - * - * If the device is in buffer mode it is guaranteed to stay - * that way until iio_device_release_buffer_mode() is called. - * - * Use with iio_device_release_buffer_mode(). - * - * Returns: 0 on success, -EBUSY on failure. - */ -int iio_device_claim_buffer_mode(struct iio_dev *indio_dev) -{ - struct iio_dev_opaque *iio_dev_opaque =3D to_iio_dev_opaque(indio_dev); - - mutex_lock(&iio_dev_opaque->mlock); - - if (iio_buffer_enabled(indio_dev)) - return 0; - - mutex_unlock(&iio_dev_opaque->mlock); - return -EBUSY; -} -EXPORT_SYMBOL_GPL(iio_device_claim_buffer_mode); - -/** - * iio_device_release_buffer_mode - releases claim on buffer mode - * @indio_dev: the iio_dev associated with the device - * - * Release the claim. Device is no longer guaranteed to stay - * in buffer mode. - * - * Use with iio_device_claim_buffer_mode(). - */ -void iio_device_release_buffer_mode(struct iio_dev *indio_dev) -{ - mutex_unlock(&to_iio_dev_opaque(indio_dev)->mlock); -} -EXPORT_SYMBOL_GPL(iio_device_release_buffer_mode); - /** * iio_device_get_current_mode() - helper function providing read-only acc= ess to * the opaque @currentmode variable diff --git a/drivers/iio/light/opt4060.c b/drivers/iio/light/opt4060.c index 981c704e7df5..8c4a1f562a83 100644 --- a/drivers/iio/light/opt4060.c +++ b/drivers/iio/light/opt4060.c @@ -304,7 +304,7 @@ static int opt4060_set_driver_state(struct iio_dev *ind= io_dev, struct opt4060_chip *chip =3D iio_priv(indio_dev); int ret =3D 0; any_mode_retry: - if (iio_device_claim_buffer_mode(indio_dev)) { + if (!iio_device_try_claim_buffer_mode(indio_dev)) { /* * This one is a *bit* hacky. If we cannot claim buffer mode, * then try direct mode so that we make sure things cannot diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index e263ab5eeccf..36bd14e93a75 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -706,8 +706,39 @@ static inline bool iio_device_claim_direct(struct iio_= dev *indio_dev) */ #define iio_device_release_direct(indio_dev) __iio_dev_mode_unlock(indio_d= ev) =20 -int iio_device_claim_buffer_mode(struct iio_dev *indio_dev); -void iio_device_release_buffer_mode(struct iio_dev *indio_dev); +/** + * iio_device_try_claim_buffer_mode() - Keep device in buffer mode + * @indio_dev: the iio_dev associated with the device + * + * If the device is in buffer mode it is guaranteed to stay + * that way until iio_device_release_buffer_mode() is called. + * + * Use with iio_device_release_buffer_mode(). + * + * Returns: true on success, false on failure. + */ +static inline bool iio_device_try_claim_buffer_mode(struct iio_dev *indio_= dev) +{ + __iio_dev_mode_lock(indio_dev); + + if (!iio_buffer_enabled(indio_dev)) { + __iio_dev_mode_unlock(indio_dev); + return false; + } + + return true; +} + +/** + * iio_device_release_buffer_mode() - releases claim on buffer mode + * @indio_dev: the iio_dev associated with the device + * + * Release the claim. Device is no longer guaranteed to stay + * in buffer mode. + * + * Use with iio_device_try_claim_buffer_mode(). + */ +#define iio_device_release_buffer_mode(indio_dev) __iio_dev_mode_unlock(in= dio_dev) =20 extern const struct bus_type iio_bus_type; =20 --=20 2.52.0