From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 4BA2347AF5C for ; Fri, 15 May 2026 17:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866868; cv=none; b=tI8QVNAUVRaKbQMMXYSupR621aun+L6HG0qkdeF2CjzKAY2fgyg/+b0rPsIzyGv0nGcErYBnq6xWaC/xKXVpOgyeXL/LxK1pUMJHaG1NK+L/Ua+6uBrZb3ljTq1EeSCw+TcHYn70/nsXca3NsMCOP3zPfQXvvCsWpcEXmKME3dA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866868; c=relaxed/simple; bh=uSuA/aq+O3Tb5ToGC82xOWMuSAsrdYEFRBOSaXRb3SE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ea1QD6Wn+W82yulU7u7ifEOnC/4yr04aV3iURdo+TpfYgdE2TuA6RmJJVoBeG7ytgxVrshnr/6EF6AJV4PxYpGMCSKoXO88cGlrA922UdKpRKBS/Na4muKWcoxfBzKBLTSxhP2pfTVFefI/sRabHEo2aXd0uZ/10Llt3eDm/jDc= 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=JI4ORN7Z; arc=none smtp.client-ip=209.85.210.172 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="JI4ORN7Z" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-8353fd1cb5fso21170b3a.0 for ; Fri, 15 May 2026 10:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778866864; x=1779471664; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W1EmbB9yn/ziU4+rXTkis0g6M2ccv54s7vfcqmIwSMw=; b=JI4ORN7ZTdfwDCQZxQd7bTFB8st32rtMcjRODlJOSaNl4RpsU2zqp6Lb2Ret0yIGs7 WNS9LeEVPRHZH0q3GjhBWfknE2p5yrIxz7lmOwGMGuBg8uPriHUPGp32cdF04dhCMMBM La9kknQy434r30JB+lVXokHqLSu4nOiIlTIWSbBlYKuh7vW8UwoQz24oeBcGPt4AGyHl YxewfA804sYcUsxq7strIWNG33w6yawz04jdnEpJ3PyDKuq+dcSJNch5RB2ggq1Syn51 U9dEjPA/G2UDhCOvrzo2EMig9/1vI3zWoJNj5HrPTN66JjJDnIVBfZFbNhad44j98fFL eO/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866864; x=1779471664; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=W1EmbB9yn/ziU4+rXTkis0g6M2ccv54s7vfcqmIwSMw=; b=h5pUD9N6BZbfGzid1XSSiEGgGGfWzsmJnJ3xSxrkRza3uDSXAgE/nwbfj1ExLM+Bvu u2PjNCwaM/QxOlUwS2jXzBQTzkBrQsFHvgSqbJ3QtQjljr8AUU4ODLx+W5S20vr+dD1/ w9hkLdd3aZbhmrzKbuqOd3xbEwEY6wMVjLHAy+0Q8nDVBDWl2Gbao5kRVE6VLzmF38L+ 6UZw7wcKQj3vq5KnD1noGjaG/sL3Cd4pVxzd5cdXPu1pOlsv/6E3Y1ZrMlrYspfEr7t5 QjkJzNKkLJzbWhiVpL9HMpzOhsCh/EIL8N2onIFfIxyiAJCIY11T8L6dDrvyT2Z20wNk faLw== X-Forwarded-Encrypted: i=1; AFNElJ/qXeHXXHik+cjkFyyy+BFH7dDjApo0dSB/UmlMhhf0gv7e4jwmaAzrx3taaLSll31ZgbKZhJ7uG6l/BjU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw81jQ/VaZwGXsVLdcDGAmJNHjMshwcrB1zI9XEbBUGuRHb5tlO LCLzgHh9oVqc1/c46nBixhRiddDIKIkn3leOMxZ0SFv5m2r/ApS3rNCq X-Gm-Gg: Acq92OHHfFXOVOYrPpWNo2Kky7iVRkWnB1Wi6hX1BNBaYEecKNQ+l77KTLVf5l5WV85 DY+NDherEZPqcGnZ9QfaAOd86hJQUGNB693BXbNNwzG8M8VvcgdegjxB+U80bNpj0g+38ifuXbo 0H3b89HlSN3WlUim9yvtSiGSuxtLiKxnq5d61/mtnTxs7PZrJdbc9xDJTvOoMgbpBODGSB/v9I2 kiEK9+QMHVp3hlhdRyQk6eEK448rteXdkuPUs1cP/gI6qsr9p23DHAWbiz2vVvcaiJh6gOFj1tP 6vep5JlmW1KSVjocP0C8RhD90+b68WeS2LlansVbhmpe1+CzJH47cntCCbQMN0plX3k2ed/oMyU DQx40fdgUyBzMvz78ocAAOwjIpKEtnB1FChx4FBMcRLFDBX2AZqmWaltB5aE1j3fwQx/PLeBKEX 3aqtvN+i0stCGPNBvF9dM4YEjRvj9rI6Ekf8l/tEETugAdmJfD X-Received: by 2002:a05:6a00:179b:b0:7e8:3fcb:9b03 with SMTP id d2e1a72fcca58-83f18eb0cbdmr8651952b3a.25.1778866864548; Fri, 15 May 2026 10:41:04 -0700 (PDT) Received: from hu-ckantibh-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f2875f0fbsm5579034b3a.57.2026.05.15.10.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 10:41:04 -0700 (PDT) From: Sanjay Chitroda X-Google-Original-From: Sanjay Chitroda To: jic23@kernel.org Cc: dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, sanjayembeddedse@gmail.com, tglx@kernel.org, christophe.jaillet@wanadoo.fr, mingo@kernel.org, kees@kernel.org, nabijaczleweli@nabijaczleweli.xyz, kyungmin.park@samsung.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 09/12] iio: ssp_sensors: use guard() to release mutexes Date: Fri, 15 May 2026 23:10:14 +0530 Message-Id: <20260515174017.3962168-10-sanjayembedded@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260515174017.3962168-1-sanjayembedded@gmail.com> References: <20260515174017.3962168-1-sanjayembedded@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sanjay Chitroda Replace explicit mutex_lock() and mutex_unlock() with the guard() macro for cleaner and safer mutex handling. Signed-off-by: Sanjay Chitroda --- drivers/iio/common/ssp_sensors/ssp_spi.c | 47 ++++++++++-------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/drivers/iio/common/ssp_sensors/ssp_spi.c b/drivers/iio/common/ssp_sensors/ssp_spi.c index ebcda6de56c4..29bc3d48c42f 100644 --- a/drivers/iio/common/ssp_sensors/ssp_spi.c +++ b/drivers/iio/common/ssp_sensors/ssp_spi.c @@ -4,6 +4,7 @@ */ #include "ssp.h" +#include #define SSP_DEV (&data->spi->dev) #define SSP_GET_MESSAGE_TYPE(data) ((data) & (3 << SSP_RW)) @@ -180,9 +181,8 @@ static inline void ssp_pending_add(struct ssp_data *data, struct ssp_msg *msg, if (no_irq) return; - mutex_lock(&data->pending_lock); + guard(mutex)(&data->pending_lock); list_add_tail(&msg->list, &data->pending_list); - mutex_unlock(&data->pending_lock); } static inline void ssp_pending_del(struct ssp_data *data, struct ssp_msg *msg, @@ -191,9 +191,8 @@ static inline void ssp_pending_del(struct ssp_data *data, struct ssp_msg *msg, if (no_irq) return; - mutex_lock(&data->pending_lock); + guard(mutex)(&data->pending_lock); list_del(&msg->list); - mutex_unlock(&data->pending_lock); } static int __ssp_do_transfer(struct ssp_data *data, struct ssp_msg *msg, @@ -204,17 +203,20 @@ static int __ssp_do_transfer(struct ssp_data *data, struct ssp_msg *msg, /* msg->done must be initialized by caller */ WARN_ON(!msg->done); - mutex_lock(&data->comm_lock); + guard(mutex)(&data->comm_lock); status = ssp_check_lines(data, false); - if (status < 0) - goto _error_locked; + if (status < 0) { + data->timeout_cnt++; + return status; + } status = spi_write(data->spi, msg->buffer, SSP_HEADER_SIZE); if (status < 0) { gpiod_set_value_cansleep(data->ap_mcu_gpiod, 1); dev_err(SSP_DEV, "%s spi_write fail\n", __func__); - goto _error_locked; + data->timeout_cnt++; + return status; } ssp_pending_add(data, msg, no_irq); @@ -222,16 +224,11 @@ static int __ssp_do_transfer(struct ssp_data *data, struct ssp_msg *msg, status = ssp_check_lines(data, true); if (status < 0) { ssp_pending_del(data, msg, no_irq); - goto _error_locked; + data->timeout_cnt++; + return status; } - mutex_unlock(&data->comm_lock); return 0; - -_error_locked: - mutex_unlock(&data->comm_lock); - data->timeout_cnt++; - return status; } static int ssp_do_transfer(struct ssp_data *data, struct ssp_msg *msg, @@ -379,12 +376,12 @@ int ssp_irq_msg(struct ssp_data *data) switch (msg_type) { case SSP_AP2HUB_READ: - case SSP_AP2HUB_WRITE: + case SSP_AP2HUB_WRITE: { /* * this is a small list, a few elements - the packets can be * received with no order */ - mutex_lock(&data->pending_lock); + guard(mutex)(&data->pending_lock); list_for_each_entry_safe(iter, n, &data->pending_list, list) { if (iter->options == msg_options) { list_del(&iter->list); @@ -400,10 +397,8 @@ int ssp_irq_msg(struct ssp_data *data) * check but let's handle this */ buffer = kmalloc(length, GFP_KERNEL | GFP_DMA); - if (!buffer) { - ret = -ENOMEM; - goto _unlock; - } + if (!buffer) + return -ENOMEM; /* got dead packet so it is always an error */ ret = spi_read(data->spi, buffer, length); @@ -415,7 +410,7 @@ int ssp_irq_msg(struct ssp_data *data) dev_err(SSP_DEV, "No match error %x\n", msg_options); - goto _unlock; + break; } if (msg_type == SSP_AP2HUB_READ) @@ -433,16 +428,15 @@ int ssp_irq_msg(struct ssp_data *data) msg->length = 1; list_add_tail(&msg->list, &data->pending_list); - goto _unlock; + break; } } if (msg->done) if (!completion_done(msg->done)) complete(msg->done); -_unlock: - mutex_unlock(&data->pending_lock); break; + } case SSP_HUB2AP_WRITE: buffer = kzalloc(length, GFP_KERNEL | GFP_DMA); if (!buffer) @@ -472,7 +466,7 @@ void ssp_clean_pending_list(struct ssp_data *data) { struct ssp_msg *msg, *n; - mutex_lock(&data->pending_lock); + guard(mutex)(&data->pending_lock); list_for_each_entry_safe(msg, n, &data->pending_list, list) { list_del(&msg->list); @@ -480,7 +474,6 @@ void ssp_clean_pending_list(struct ssp_data *data) if (!completion_done(msg->done)) complete(msg->done); } - mutex_unlock(&data->pending_lock); } int ssp_command(struct ssp_data *data, char command, int arg) -- 2.34.1