From nobody Mon Feb 9 13:01:21 2026 Received: from mail-vk1-f169.google.com (mail-vk1-f169.google.com [209.85.221.169]) (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 CA987319848 for ; Tue, 6 Jan 2026 08:07:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767686839; cv=none; b=IkP9TzCl4TVLrsn272lfA7L8+dvJbxK29sRcHhYRs0F6UPhuYWZPI0Wict4VG4wSrG8whurw5eE4CKvsvEg+Pl5VEw4++8kYapk0nVZUJ9JTfPmYET5t1nQjbCx72YVdDtEO2M6G4VdJ0db2LOr2sH2dWaPTAnM54pZTixyKceM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767686839; c=relaxed/simple; bh=trpCuQxaVUO34hXycd5YZlSez0HGPWnWhu1Fv3Ai43w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B/eGlkysVPhCVSR90IrTA1EjC+GnAjT+ecASY4RCbyaNnJKrVQvtbrXOVaph7x0jtlPFhOemveLQSD5o4kWo/RHfqekvGkNc6loQcT4658h5L0SfN+1aCUWVzTLDHPLmY++XBLjxXCXYRbWrbrnBXyPV49hqQlLNposgOQEny3Q= 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=Y4kDfZYy; arc=none smtp.client-ip=209.85.221.169 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="Y4kDfZYy" Received: by mail-vk1-f169.google.com with SMTP id 71dfb90a1353d-55ae07cf627so212578e0c.1 for ; Tue, 06 Jan 2026 00:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767686837; x=1768291637; 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=0p+zjCRTkVwkR72MimreHnHFD6yBR7Iq/PnOEe7z0Ro=; b=Y4kDfZYyAiA51NfhMymyi1JoMqcqHh+dfis8UIl3WcTA1g8RKAKhHXyqQaXZFbzqsM 4xbYnHKk8vnS3rHl0UstL7KbBrmNRVMO/VtmSdE+ePUhxETabmFuZCT17TxIqItZ70ux yC2OhDLQFlzPDSPNYre06S+0Y7jL65jR+LAcQhj4wZcAArQIkf3UJd1WURTdSQjKDS1c LOzkI6oGCCaU25bmn9JPTItwwQtXRn/HkqlMRcbiwFRxULILDsFhVvza6GXbeZN75J/4 thQdcz+w4m9lNEAZBaSJclsuGm+87pYyfMs5lbQM9j6mRaVdpkXyjArhQl2x3klwBPva va0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767686837; x=1768291637; 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=0p+zjCRTkVwkR72MimreHnHFD6yBR7Iq/PnOEe7z0Ro=; b=rgjKXP23xfad0ej7AeIBv+N7KrJcvVcJVyK4XgSuCBgI/+sOKHXTFK59KEPXsKaXIn KV2JPSXw848WlOol1oc0obotJM3FRTPIep2Nc626i6cMqSuqKaxRGZQvDgBFW6zxtZow unURdW1BshZR8wsGH37+/s6jMBlHjR8dZGwdWjxeIPar9cT9n+s0L30QQO6kjupy1+rw Twf+9cY6U3QWGWFwIFLU4CIt1eWd3my6JXkecFwpUe2QetWGa6z5ZuKPghc7rYAyiocs 0eDa5MWZeSX71uckqsmL07BaGupYlLyNb4upcQvQ/8yWec5exvaOEA2VfU9A25MT8FNo RYAw== X-Forwarded-Encrypted: i=1; AJvYcCWi3Luew66ptSdiNOYQTiFjouN/HZHrYf2lKSiK756sEaZZhZDLhZ7D4XohMdDn7LX61LZ2yNJ4YhEL8J8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/lAGgi9Dq2Y44m1XgkaVGt712y66nHr3aPVWXqsoheaW6HuME Xfe4VhOJ6Bxgty6ZbJbMHdfz3sn8fzKbHrw8eVCBBpgRFnnq0rrbFYlV X-Gm-Gg: AY/fxX7lzHrP+e0/gpc+4kL+H+ZTjBfwJTiFCbaBH4sC8tQwkyEQSfWLO+rOFZPkTBi o8sR4J9DWfPmKmtWyAD9bP3+bESnGIbKwkHFJnVDQcYaflOF4VWzv8k0bKjjW/j8GJH2KZtTeGa oq47j5zrl9O/t9d2+Bv79N8WZ/Gmp7OUW2z/9vOPAq8tHcGoY6RbgqqPiG1cuV26A41pyKxl6gf PDOkRGlPoADtfLIE0w91LTPg82Bt+9WdT4baZpbgTsoBfIdoHeX937JkzXdBwAkcVdMTel9haGZ 7Kv6kkvvEaP1Uw7FczXfGv46SPqS6W0HXERq7H74koVNyW9tK5vXc2CmdRq/BxDSHF7mJNVLM05 DPQiHO1bh3IVkc/EJqglOGrS2txcl1qeO6D/XptDQgPvuZzROhnjQLYZIQa73bsfvt6w0ChL+af HWoZEFNll2fKTt6grvpXN8KSM= X-Google-Smtp-Source: AGHT+IHTIrvzVwfKQKJfyQacMro9d9cPsBkUSewIK7U13n8RWIAnR8FsTjt0MIQppCsbymPLPJiYIA== X-Received: by 2002:a05:6122:d82:b0:559:6e78:a43a with SMTP id 71dfb90a1353d-5633949058bmr606543e0c.9.1767686836506; Tue, 06 Jan 2026 00:07:16 -0800 (PST) Received: from [192.168.100.253] ([2800:bf0:82:11a2:7ac4:1f2:947b:2b6]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-944124a3386sm457615241.11.2026.01.06.00.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 00:07:16 -0800 (PST) From: Kurt Borja Date: Tue, 06 Jan 2026 03:06:58 -0500 Subject: [PATCH v3 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: <20260106-lock-impr-v3-3-1db909b192c0@gmail.com> References: <20260106-lock-impr-v3-0-1db909b192c0@gmail.com> In-Reply-To: <20260106-lock-impr-v3-0-1db909b192c0@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=7873; i=kuurtb@gmail.com; h=from:subject:message-id; bh=trpCuQxaVUO34hXycd5YZlSez0HGPWnWhu1Fv3Ai43w=; b=owGbwMvMwCUmluBs8WX+lTTG02pJDJkxh1YVa9+N3X/lqc/P+1VnXb8ve/u3vDN5b+qNhVUpm 2Itg4JedZSyMIhxMciKKbK0Jyz69igq763fgdD7MHNYmUCGMHBxCsBEjv9g+B+8pK6nOcE/K0e0 etb9huCJi1yv3JA7Lva/TCmaozN4UgnDP4WjTHkXWI5elGCr/pxwed0ijwMHrqdPmrVD0nf+p0m h09kB 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(). 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 550d100d9cfa..52a16ce87e02 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 3cf340208694..d8af0456f966 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