From nobody Sat Oct 11 00:22:27 2025 Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) (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 93FD42BD5B9; Wed, 11 Jun 2025 19:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671276; cv=none; b=gEg5OYfr+Is4tEuzfqFqbb+1DDi6Xafg3WlideBvWxnljBNkAeLS0kPdtMTPsYCMFxJoYLQG6wSNpbqj4KWaUJ2cXrSMnN16ODEsf0GEAGoe8UsXk4w4Ap+2FtseSSnQVNmdo2nkAvWwdPfzpDtuY055gB+6OhZ7AbFQ+VpEOZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671276; c=relaxed/simple; bh=smzX7C3twUdA1NNM8wBfAOff/YFksIjG59CddnyWsXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=udTmNJGZVZ8RvGxCJQUwPKcaUpW2HuXKQuD2rza3apikeUpQQ94e2PFrYSzRgKixuV9HVG3UmhbVXnmXHqxZFmslOtCx3Qbjwoh4W6PtcB654Pzw++iSfX8wPc4XEb8xWv+Cok9DhxemWUjAZFrV3HJYmYROgSyTvwxinEfxo5A= 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=IMuuiNH1; arc=none smtp.client-ip=209.85.128.180 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="IMuuiNH1" Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-7113ac6d4b3so1410947b3.3; Wed, 11 Jun 2025 12:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749671273; x=1750276073; 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=lCE3dDRzDVwJNp9h/otx2hIV9aBHTXeqV3g5kT6Wtz0=; b=IMuuiNH1SMd/v3wpea98vLqmc55DGar7viCvT0+DpNt0Z0wdWz+yqCEPa/WStjkQ3C qI9rb9MP/mXa82c2osCL9HS/4hwhjGLXXFr5HPMOyxppqnBqDhqxwbPdq8OifvZtnt5O Wh/KAzhUJRvLX8peCL54PoBwmXLekrNfn6Y4ESYD13hLd5K9ZxHxCUeH5AMhMLdibT4g MgdAjjmxw8AnISUp3hynV0Nr90f2BkWFQsRIuvRkRR77cAebA9OIYmU4DXQy8lOgNnpq dmO8Dzn0zpVQXuNQX0Awbpwn4MGLPdzAuHpLU1c4Y3UsQH8lnJiNTymYIP+azpRL4gek Yo1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749671273; x=1750276073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lCE3dDRzDVwJNp9h/otx2hIV9aBHTXeqV3g5kT6Wtz0=; b=UlnzNBP+bfrJICvu/hFjDufH2Tg8v/3ULqJ/f0dMEim6S7IJQSb9bRiCF8g35srtfY EdbypHlbjX6/B44RNvv8tEgi9jOM9CIga866W4eKHmHHGyyiYhFwwVvcSzX/wMDYpPBj HEravyycglU8HGkC6SMrfr+1DNLTT49XEoVw1dY0jpiNOjiCA7EC8EehmorwOWtCaLsV 81npSCHwYuqr8ai2x8C1KsgAu7GzVLqpVILIOI7MrAPMVy2VSe6lAmPKs5MwoTXt5de5 3eX9jJr3JndUD5JUMiGGG7XRTH6usBYKQ9i+lKGnZ1+U0Gf2iH9DrIyu4uoA+9Thdfx0 6wgQ== X-Forwarded-Encrypted: i=1; AJvYcCUcWS+zDmkG9IV8t1xx4/gsLa8sq56wesRkKsERXDxNrpjg+KYjSBEvG6zz43yHDcTGvGMy8S463WqoDtsB@vger.kernel.org, AJvYcCW/5DFZ0l8qCaAJk6IFbENWDxJzJTGz9D/E8rp9vLn5OGvLFTDyBoGjgmDuGqU8/zpdkOhrI56meII=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5VsPWbfBlcABjNMES0P5Cb+0XtpLMy9H0gkLl9Lktq84xv5ym 3WGU1EUZAT9Vs2o/fcPnyj6BXW3OfwEvzG/BLsRbrKnIRYSNfOlYZwaC X-Gm-Gg: ASbGncumR4/PaRBMXXyb/M8rTXrfzqxsS1Vkky7BNBJ6iuimv3G8bz7Ysr4FwLYnJ/s BJlr/DbGNMtrEbvos1Z2ahdJVp58bnaGosiSF0tesNEq6X+C1vq0Qco/178twPA7bXEcm8D9K+h E2JJplfJpDgjBZdgIdfHpVpLomTptA1QzEOW9wjJ5CuKLWpr4Niwvbs+FMHG8kr+a9WgXoPF9zP ycVxJDivuvU1+D61AsNUXDryII0AzbrGyScBd0eujenjpfRsE+pgQ9AFAFOer3IkmGhYPB11dvZ T7TPPW3H7ouMYvVG1RtuA8mcIYSlrl4SqE0HG4S3cLGPzaK+R0FFIKxoMmXQr47dISj1vKO7dcU 1fAni X-Google-Smtp-Source: AGHT+IHNKAtp0ckn1BlkBoqTrbyKeEmqJrBsZRzKSwy0gcvXHEv1bxh0pUIcRmOMiPlgmUhaL2bKAQ== X-Received: by 2002:a05:690c:4991:b0:709:19f7:d7ce with SMTP id 00721157ae682-7114ed83dd5mr16839437b3.31.1749671273522; Wed, 11 Jun 2025 12:47:53 -0700 (PDT) Received: from delta4.semfio.usp.br ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7115206130csm80587b3.1.2025.06.11.12.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 12:47:53 -0700 (PDT) From: Andrew Ijano X-Google-Original-From: Andrew Ijano To: jic23@kernel.org Cc: andrew.lopes@alumni.usp.br, gustavobastos@usp.br, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, jstephan@baylibre.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/3] iio: accel: sca3000: replace error_ret labels by simple returns Date: Wed, 11 Jun 2025 16:39:19 -0300 Message-ID: <20250611194648.18133-2-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> References: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace usage of error_ret labels by returning directly when handling errors. Cases that do a mutex unlock were not changed. Signed-off-by: Andrew Ijano Co-developed-by: Gustavo Bastos Signed-off-by: Gustavo Bastos Suggested-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Reviewed-by: Nuno S=C3=A1 --- drivers/iio/accel/sca3000.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index aabe4491efd7..bfa8a3f5a92f 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -369,23 +369,20 @@ static int sca3000_write_ctrl_reg(struct sca3000_stat= e *st, =20 ret =3D sca3000_reg_lock_on(st); if (ret < 0) - goto error_ret; + return ret; if (ret) { ret =3D __sca3000_unlock_reg_lock(st); if (ret) - goto error_ret; + return ret; } =20 /* Set the control select register */ ret =3D sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, sel); if (ret) - goto error_ret; + return ret; =20 /* Write the actual value into the register */ - ret =3D sca3000_write_reg(st, SCA3000_REG_CTRL_DATA_ADDR, val); - -error_ret: - return ret; + return sca3000_write_reg(st, SCA3000_REG_CTRL_DATA_ADDR, val); } =20 /** @@ -402,22 +399,20 @@ static int sca3000_read_ctrl_reg(struct sca3000_state= *st, =20 ret =3D sca3000_reg_lock_on(st); if (ret < 0) - goto error_ret; + return ret; if (ret) { ret =3D __sca3000_unlock_reg_lock(st); if (ret) - goto error_ret; + return ret; } /* Set the control select register */ ret =3D sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, ctrl_reg); if (ret) - goto error_ret; + return ret; ret =3D sca3000_read_data_short(st, SCA3000_REG_CTRL_DATA_ADDR, 1); if (ret) - goto error_ret; + return ret; return st->rx[0]; -error_ret: - return ret; } =20 /** @@ -577,7 +572,8 @@ static inline int __sca3000_get_base_freq(struct sca300= 0_state *st, =20 ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); if (ret) - goto error_ret; + return ret; + switch (SCA3000_REG_MODE_MODE_MASK & st->rx[0]) { case SCA3000_REG_MODE_MEAS_MODE_NORMAL: *base_freq =3D info->measurement_mode_freq; @@ -591,7 +587,6 @@ static inline int __sca3000_get_base_freq(struct sca300= 0_state *st, default: ret =3D -EINVAL; } -error_ret: return ret; } =20 @@ -834,7 +829,7 @@ static ssize_t sca3000_read_av_freq(struct device *dev, val =3D st->rx[0]; mutex_unlock(&st->lock); if (ret) - goto error_ret; + return ret; =20 switch (val & SCA3000_REG_MODE_MODE_MASK) { case SCA3000_REG_MODE_MEAS_MODE_NORMAL: @@ -857,8 +852,6 @@ static ssize_t sca3000_read_av_freq(struct device *dev, break; } return len; -error_ret: - return ret; } =20 /* --=20 2.49.0 From nobody Sat Oct 11 00:22:27 2025 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 52CBC2BDC15; Wed, 11 Jun 2025 19:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671279; cv=none; b=snhWdHWbSr8vMiViEYTzStGFB0gOk8sO7iotjMU2LfOSt0YcN5YZX0PwFtQ3j7MgStnACIRsqNTxkGdkN3/318zTvyL0guwXq1djrokNrW3MFo2xFWYMaRq9MBpgBJMmwNjDl7QRHCrw8AeirOuK28mBdQTHfNTAbTEa/wJyeZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671279; c=relaxed/simple; bh=YLOU2F2CnWpQj8rysO2FOjfX55FB+LVbYS4tZ08XEQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KsAVPkrCueUn8Fb7YrsBj0hRm/1d5RuQyBepk8Pbbjap1sC/ZjbagV1d0Eg7eJsAyIxmcrcKYlQ7H4oYHMkr+LMiG7762HMESC4z37fVS5kgo9YazKU13lJU2CdYGK6LPCPLr69gOGiIaOJFkHWFY6UdpzdcmVWv/dnwudF4y1w= 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=O4nsHuUA; arc=none smtp.client-ip=209.85.128.170 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="O4nsHuUA" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-70e23e9aeefso1342747b3.2; Wed, 11 Jun 2025 12:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749671276; x=1750276076; 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=ULXucmHQ+DQI9KRwaFAtDXf0XTvdLDrcQBcmoDWQaNA=; b=O4nsHuUAhnQYZqSm6++0v+LyAiOIZ4nbgVuVguJcGeDsZzz+l0iizY9l9kKB/oK2FX ZDZrR4jm5TVnWhgFZ4D9NISLxSPAGRgFWkOIg8e5wJPa4MW610I78U+rWkweND/bqkg2 WaUBdynHgulTLfFN4+fN8g/le/zXKGmxDpnPmBnaCxAXt/79aI5fwmC52b3tBTNrUH4I DCNOfKrO167bevHTAj7Tm2XxK1a2eQP41LWQ4t6jRMqxqKRIUaeRh1etN66UWR1RwzVE roXyH/0Fx3SfamxDGaY2946xW0MFdQ2VCt1/NyD5QpR1KmUGlkV8VVAgOfdRZhchLzfe Is/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749671276; x=1750276076; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ULXucmHQ+DQI9KRwaFAtDXf0XTvdLDrcQBcmoDWQaNA=; b=aesBWOprJQgBuf0suvWINc6KkpsL0BQULmuAvu1aA2R/qN+P6oeRf2KtWPODRhzysD ZrsPrMR5XzqGIBZZp0GL0YJ/fUXrkJtnvmBctSZFN4aGbcH3o43GB3M/5edoiaTJI1S9 b7w98ukipVMy8XhOhSt6i0q9trEsCreNv7LIFi4F8TIZx48Ptk+HGYekowU0wE4u/ngW pt4m1VnHmN4S9qxpBgp6egkxRU4SMRFEcv+42ttVEMD4s1lT/zQY6DBUA7uOLjL2DM+N iEFbgxDMKssDA2ObF9p/IUh6zdA9LsYne6WGGfNHTBCK1KHQ7Uge+i72P6+hKUCE/3Fe ctuQ== X-Forwarded-Encrypted: i=1; AJvYcCUyQHgfzeeAe9vHQTMf2x1PkJ6KUeh/Fiyqr3FoYLc/Sr3BEPee8zv0Knvvkp70EmpbgRuBy8zRqyoyxHo1@vger.kernel.org, AJvYcCX9Gc35csIbxsCwapb2YHbBhx7MRqTCQjV7Ohp+x2ZNBdj6wYZTReZYU7Onnxv2DZbx1FDMdLOBgHg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/rZGRujAsxbAsMDRPk4TdLULZ8hZtuR9/T9wyfIis2nii2IDW Ck3/1JmKCg/hSoC+6VDM4Np2FxLGtKosEG0FGfi6iThr94UaswT4aM15 X-Gm-Gg: ASbGncsW8XQRg+yVUB+oYUL1sAeSK3ZVvZuf5pCVbE5IMltSQF3JKDHh0n5RrE9MKKW 2cukKwecxqaS8YaxlaINgbCGVR0m3CZ55PbTPLFt/nOMkTJ1QtQESPNBw1qeIUrzDiS0kcWEBxz wZ4IltsJkXKHFlYVhqhtW5mBGPbREYllGBWRSOdPX16f5Rqf6MVWqqxtfiB1L43rDTGyrRK9IOr yx+oxPRB6peZAOsLhHF8OQEnj8x8UH8aX7j9UhZ3rk88CUsbyYDANQBzRhGaWdFzxjK3pI1r58H aJTRu+W4rKTiQ7xfdp58RU5+3BPz7q73k8pLPiDSVHELpEOgAh/7xN3fP2eKlfc/BUZ5bsOrSqe 5qayTztiGtzyhYIM= X-Google-Smtp-Source: AGHT+IG/UXfJJh+pp7lcWjw/SthtjALYOPD+4ffiOAQQXWyLedNggTKTtwTMjnFLmmOGBMHTthqx8g== X-Received: by 2002:a05:690c:7007:b0:70d:f07c:f593 with SMTP id 00721157ae682-7114ec49002mr19803177b3.6.1749671276052; Wed, 11 Jun 2025 12:47:56 -0700 (PDT) Received: from delta4.semfio.usp.br ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7115206130csm80587b3.1.2025.06.11.12.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 12:47:55 -0700 (PDT) From: Andrew Ijano X-Google-Original-From: Andrew Ijano To: jic23@kernel.org Cc: andrew.lopes@alumni.usp.br, gustavobastos@usp.br, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, jstephan@baylibre.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 2/3] iio: accel: sca3000: replace usages of internal read data helpers by spi helpers Date: Wed, 11 Jun 2025 16:39:20 -0300 Message-ID: <20250611194648.18133-3-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> References: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove usages of sca3000_read_data() and sca3000_read_data_short() functions, replacing it by spi_w8r8() and spi_w8r16be() helpers. Just one case that reads large buffers is left using an internal helper. This is an old driver that was not making full use of the newer infrastructure. Signed-off-by: Andrew Ijano Co-developed-by: Gustavo Bastos Signed-off-by: Gustavo Bastos Suggested-by: Jonathan Cameron --- drivers/iio/accel/sca3000.c | 166 +++++++++++++++--------------------- 1 file changed, 68 insertions(+), 98 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index bfa8a3f5a92f..d41759c68fb4 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -281,24 +281,6 @@ static int sca3000_write_reg(struct sca3000_state *st,= u8 address, u8 val) return spi_write(st->us, st->tx, 2); } =20 -static int sca3000_read_data_short(struct sca3000_state *st, - u8 reg_address_high, - int len) -{ - struct spi_transfer xfer[2] =3D { - { - .len =3D 1, - .tx_buf =3D st->tx, - }, { - .len =3D len, - .rx_buf =3D st->rx, - } - }; - st->tx[0] =3D SCA3000_READ_REG(reg_address_high); - - return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer)); -} - /** * sca3000_reg_lock_on() - test if the ctrl register lock is on * @st: Driver specific device instance data. @@ -309,11 +291,11 @@ static int sca3000_reg_lock_on(struct sca3000_state *= st) { int ret; =20 - ret =3D sca3000_read_data_short(st, SCA3000_REG_STATUS_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_STATUS_ADDR)); if (ret < 0) return ret; =20 - return !(st->rx[0] & SCA3000_LOCKED); + return !(ret & SCA3000_LOCKED); } =20 /** @@ -409,10 +391,7 @@ static int sca3000_read_ctrl_reg(struct sca3000_state = *st, ret =3D sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, ctrl_reg); if (ret) return ret; - ret =3D sca3000_read_data_short(st, SCA3000_REG_CTRL_DATA_ADDR, 1); - if (ret) - return ret; - return st->rx[0]; + return spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_CTRL_DATA_ADDR)); } =20 /** @@ -427,13 +406,13 @@ static int sca3000_print_rev(struct iio_dev *indio_de= v) struct sca3000_state *st =3D iio_priv(indio_dev); =20 mutex_lock(&st->lock); - ret =3D sca3000_read_data_short(st, SCA3000_REG_REVID_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_REVID_ADDR)); if (ret < 0) goto error_ret; dev_info(&indio_dev->dev, "sca3000 revision major=3D%lu, minor=3D%lu\n", - st->rx[0] & SCA3000_REG_REVID_MAJOR_MASK, - st->rx[0] & SCA3000_REG_REVID_MINOR_MASK); + ret & SCA3000_REG_REVID_MAJOR_MASK, + ret & SCA3000_REG_REVID_MINOR_MASK); error_ret: mutex_unlock(&st->lock); =20 @@ -570,7 +549,7 @@ static inline int __sca3000_get_base_freq(struct sca300= 0_state *st, { int ret; =20 - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) return ret; =20 @@ -660,13 +639,13 @@ static int sca3000_read_3db_freq(struct sca3000_state= *st, int *val) { int ret; =20 - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) return ret; =20 /* mask bottom 2 bits - only ones that are relevant */ - st->rx[0] &=3D SCA3000_REG_MODE_MODE_MASK; - switch (st->rx[0]) { + ret &=3D SCA3000_REG_MODE_MODE_MASK; + switch (ret) { case SCA3000_REG_MODE_MEAS_MODE_NORMAL: *val =3D st->info->measurement_mode_3db_freq; return IIO_VAL_INT; @@ -698,14 +677,14 @@ static int sca3000_write_3db_freq(struct sca3000_stat= e *st, int val) mode =3D SCA3000_REG_MODE_MEAS_MODE_OP_2; else return -EINVAL; - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) return ret; =20 - st->rx[0] &=3D ~SCA3000_REG_MODE_MODE_MASK; - st->rx[0] |=3D (mode & SCA3000_REG_MODE_MODE_MASK); + ret &=3D ~SCA3000_REG_MODE_MODE_MASK; + ret |=3D (mode & SCA3000_REG_MODE_MODE_MASK); =20 - return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, st->rx[0]); + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, ret); } =20 static int sca3000_read_raw(struct iio_dev *indio_dev, @@ -727,25 +706,22 @@ static int sca3000_read_raw(struct iio_dev *indio_dev, return -EBUSY; } address =3D sca3000_addresses[chan->address][0]; - ret =3D sca3000_read_data_short(st, address, 2); + ret =3D spi_w8r16be(st->us, SCA3000_READ_REG(address)); if (ret < 0) { mutex_unlock(&st->lock); return ret; } - *val =3D sign_extend32(be16_to_cpup((__be16 *)st->rx) >> - chan->scan_type.shift, + *val =3D sign_extend32(ret >> chan->scan_type.shift, chan->scan_type.realbits - 1); } else { /* get the temperature when available */ - ret =3D sca3000_read_data_short(st, - SCA3000_REG_TEMP_MSB_ADDR, - 2); + ret =3D spi_w8r16be(st->us, + SCA3000_READ_REG(SCA3000_REG_TEMP_MSB_ADDR)); if (ret < 0) { mutex_unlock(&st->lock); return ret; } - *val =3D (be16_to_cpup((__be16 *)st->rx) >> - chan->scan_type.shift) & + *val =3D (ret >> chan->scan_type.shift) & GENMASK(chan->scan_type.realbits - 1, 0); } mutex_unlock(&st->lock); @@ -822,16 +798,15 @@ static ssize_t sca3000_read_av_freq(struct device *de= v, { struct iio_dev *indio_dev =3D dev_to_iio_dev(dev); struct sca3000_state *st =3D iio_priv(indio_dev); - int len =3D 0, ret, val; + int len =3D 0, ret; =20 mutex_lock(&st->lock); - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); - val =3D st->rx[0]; + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); mutex_unlock(&st->lock); if (ret) return ret; =20 - switch (val & SCA3000_REG_MODE_MODE_MASK) { + switch (ret & SCA3000_REG_MODE_MODE_MASK) { case SCA3000_REG_MODE_MEAS_MODE_NORMAL: len +=3D sprintf(buf + len, "%d %d %d\n", st->info->measurement_mode_freq, @@ -964,7 +939,6 @@ static const struct attribute_group sca3000_attribute_g= roup =3D { =20 static int sca3000_read_data(struct sca3000_state *st, u8 reg_address_high, - u8 *rx, int len) { int ret; @@ -974,18 +948,15 @@ static int sca3000_read_data(struct sca3000_state *st, .tx_buf =3D st->tx, }, { .len =3D len, - .rx_buf =3D rx, + .rx_buf =3D st->rx, } }; - st->tx[0] =3D SCA3000_READ_REG(reg_address_high); + ret =3D spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer)); - if (ret) { + if (ret) dev_err(&st->us->dev, "problem reading register\n"); - return ret; - } - - return 0; + return ret; } =20 /** @@ -1001,16 +972,15 @@ static void sca3000_ring_int_process(u8 val, struct = iio_dev *indio_dev) mutex_lock(&st->lock); =20 if (val & SCA3000_REG_INT_STATUS_HALF) { - ret =3D sca3000_read_data_short(st, SCA3000_REG_BUF_COUNT_ADDR, - 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_BUF_COUNT_ADDR)); if (ret) goto error_ret; - num_available =3D st->rx[0]; + num_available =3D ret; /* * num_available is the total number of samples available * i.e. number of time points * number of channels. */ - ret =3D sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, st->rx, + ret =3D sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, num_available * 2); if (ret) goto error_ret; @@ -1045,7 +1015,7 @@ static irqreturn_t sca3000_event_handler(int irq, voi= d *private) { struct iio_dev *indio_dev =3D private; struct sca3000_state *st =3D iio_priv(indio_dev); - int ret, val; + int ret; s64 last_timestamp =3D iio_get_time_ns(indio_dev); =20 /* @@ -1053,15 +1023,14 @@ static irqreturn_t sca3000_event_handler(int irq, v= oid *private) * but ensures no interrupt is missed. */ mutex_lock(&st->lock); - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_STATUS_ADDR, 1); - val =3D st->rx[0]; + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_STATUS_ADDR)); mutex_unlock(&st->lock); if (ret) goto done; =20 - sca3000_ring_int_process(val, indio_dev); + sca3000_ring_int_process(ret, indio_dev); =20 - if (val & SCA3000_INT_STATUS_FREE_FALL) + if (ret & SCA3000_INT_STATUS_FREE_FALL) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, @@ -1070,7 +1039,7 @@ static irqreturn_t sca3000_event_handler(int irq, voi= d *private) IIO_EV_DIR_FALLING), last_timestamp); =20 - if (val & SCA3000_INT_STATUS_Y_TRIGGER) + if (ret & SCA3000_INT_STATUS_Y_TRIGGER) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, @@ -1079,7 +1048,7 @@ static irqreturn_t sca3000_event_handler(int irq, voi= d *private) IIO_EV_DIR_RISING), last_timestamp); =20 - if (val & SCA3000_INT_STATUS_X_TRIGGER) + if (ret & SCA3000_INT_STATUS_X_TRIGGER) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, @@ -1088,7 +1057,7 @@ static irqreturn_t sca3000_event_handler(int irq, voi= d *private) IIO_EV_DIR_RISING), last_timestamp); =20 - if (val & SCA3000_INT_STATUS_Z_TRIGGER) + if (ret & SCA3000_INT_STATUS_Z_TRIGGER) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, @@ -1114,13 +1083,13 @@ static int sca3000_read_event_config(struct iio_dev= *indio_dev, /* read current value of mode register */ mutex_lock(&st->lock); =20 - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) goto error_ret; =20 switch (chan->channel2) { case IIO_MOD_X_AND_Y_AND_Z: - ret =3D !!(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT); + ret =3D !!(ret & SCA3000_REG_MODE_FREE_FALL_DETECT); break; case IIO_MOD_X: case IIO_MOD_Y: @@ -1129,7 +1098,7 @@ static int sca3000_read_event_config(struct iio_dev *= indio_dev, * Motion detection mode cannot run at the same time as * acceleration data being read. */ - if ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK) + if ((ret & SCA3000_REG_MODE_MODE_MASK) !=3D SCA3000_REG_MODE_MEAS_MODE_MOT_DET) { ret =3D 0; } else { @@ -1157,20 +1126,20 @@ static int sca3000_freefall_set_state(struct iio_de= v *indio_dev, bool state) int ret; =20 /* read current value of mode register */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) return ret; =20 /* if off and should be on */ - if (state && !(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT)) + if (state && !(ret & SCA3000_REG_MODE_FREE_FALL_DETECT)) return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - st->rx[0] | SCA3000_REG_MODE_FREE_FALL_DETECT); + ret | SCA3000_REG_MODE_FREE_FALL_DETECT); /* if on and should be off */ - else if (!state && (st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT)) + if (!state && (ret & SCA3000_REG_MODE_FREE_FALL_DETECT)) return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - st->rx[0] & ~SCA3000_REG_MODE_FREE_FALL_DETECT); - else - return 0; + ret & ~SCA3000_REG_MODE_FREE_FALL_DETECT); + + return 0; } =20 static int sca3000_motion_detect_set_state(struct iio_dev *indio_dev, int = axis, @@ -1207,22 +1176,22 @@ static int sca3000_motion_detect_set_state(struct i= io_dev *indio_dev, int axis, } =20 /* read current value of mode register */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) return ret; /* if off and should be on */ if ((st->mo_det_use_count) && - ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK) + ((ret & SCA3000_REG_MODE_MODE_MASK) !=3D SCA3000_REG_MODE_MEAS_MODE_MOT_DET)) return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - (st->rx[0] & ~SCA3000_REG_MODE_MODE_MASK) + (ret & ~SCA3000_REG_MODE_MODE_MASK) | SCA3000_REG_MODE_MEAS_MODE_MOT_DET); /* if on and should be off */ else if (!(st->mo_det_use_count) && - ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK) + ((ret & SCA3000_REG_MODE_MODE_MASK) =3D=3D SCA3000_REG_MODE_MEAS_MODE_MOT_DET)) return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - st->rx[0] & SCA3000_REG_MODE_MODE_MASK); + ret & SCA3000_REG_MODE_MODE_MASK); else return 0; } @@ -1280,18 +1249,18 @@ int __sca3000_hw_ring_state_set(struct iio_dev *ind= io_dev, bool state) int ret; =20 mutex_lock(&st->lock); - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) goto error_ret; if (state) { dev_info(&indio_dev->dev, "supposedly enabling ring buffer\n"); ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - (st->rx[0] | SCA3000_REG_MODE_RING_BUF_ENABLE)); + (ret | SCA3000_REG_MODE_RING_BUF_ENABLE)); } else ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - (st->rx[0] & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); + (ret & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); error_ret: mutex_unlock(&st->lock); =20 @@ -1315,12 +1284,12 @@ static int sca3000_hw_ring_preenable(struct iio_dev= *indio_dev) mutex_lock(&st->lock); =20 /* Enable the 50% full interrupt */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) goto error_unlock; ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, - st->rx[0] | SCA3000_REG_INT_MASK_RING_HALF); + ret | SCA3000_REG_INT_MASK_RING_HALF); if (ret) goto error_unlock; =20 @@ -1346,12 +1315,12 @@ static int sca3000_hw_ring_postdisable(struct iio_d= ev *indio_dev) /* Disable the 50% full interrupt */ mutex_lock(&st->lock); =20 - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) goto unlock; ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, - st->rx[0] & ~SCA3000_REG_INT_MASK_RING_HALF); + ret & ~SCA3000_REG_INT_MASK_RING_HALF); unlock: mutex_unlock(&st->lock); return ret; @@ -1376,7 +1345,7 @@ static int sca3000_clean_setup(struct sca3000_state *= st) =20 mutex_lock(&st->lock); /* Ensure all interrupts have been acknowledged */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_STATUS_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) goto error_ret; =20 @@ -1402,7 +1371,7 @@ static int sca3000_clean_setup(struct sca3000_state *= st) if (ret) goto error_ret; /* Enable interrupts, relevant to mode and set up as active low */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) goto error_ret; ret =3D sca3000_write_reg(st, @@ -1416,11 +1385,11 @@ static int sca3000_clean_setup(struct sca3000_state= *st) * Ring in 12 bit mode - it is fine to overwrite reserved bits 3,5 * as that occurs in one of the example on the datasheet */ - ret =3D sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) goto error_ret; ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, - (st->rx[0] & SCA3000_MODE_PROT_MASK)); + ret & SCA3000_MODE_PROT_MASK); =20 error_ret: mutex_unlock(&st->lock); @@ -1503,14 +1472,15 @@ static int sca3000_stop_all_interrupts(struct sca30= 00_state *st) int ret; =20 mutex_lock(&st->lock); - ret =3D sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1); + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) goto error_ret; + ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, - (st->rx[0] & - ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER | - SCA3000_REG_INT_MASK_RING_HALF | - SCA3000_REG_INT_MASK_ALL_INTS))); + ret & + ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER | + SCA3000_REG_INT_MASK_RING_HALF | + SCA3000_REG_INT_MASK_ALL_INTS)); error_ret: mutex_unlock(&st->lock); return ret; --=20 2.49.0 From nobody Sat Oct 11 00:22:27 2025 Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) (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 213BC2BDC2C; Wed, 11 Jun 2025 19:47:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671282; cv=none; b=pLep2W3F6M8StkFL0zjeugnaER4IUukEiZZHYV3mDO14SXQkGJpYPCJj7oEaVQVYJgkZP95AtvliUAy7F6vYe0UsJQra2bnQRmuYWwusEoEJQeyLhy3E1DS1LZWqATpplaXU03rirKzJiTusrVir6AfJ3v9jUzQnoD2uT9PtB8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749671282; c=relaxed/simple; bh=ySuUknDOu9Ye2nlxzI4/NsiZPAimXndQXRImEuAWrXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g2x0kE4M/G4IpRfxqnAjIJtwsSdscffjmW7R3UyDkg2LSgY20u9oFcGNlc4OEnyxEzboya/8bSjgxKJBzftuzRuZqeM2O8YTgWJSbUIXoeQiYdUQcoVVrRcZ2fXBenv82csPSxaR++Zpgj+55UL2Axw/M3oAYsJliR8/JocykYM= 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=bQf9bM8B; arc=none smtp.client-ip=209.85.128.176 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="bQf9bM8B" Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-7086dcab64bso1607507b3.1; Wed, 11 Jun 2025 12:47:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749671279; x=1750276079; 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=AfQ1uSWXIil7J+7zJ57XvDKktzBGNsJQ/2rNxebYhh0=; b=bQf9bM8BDodmumQQwmpPPfWZKQNwcPfkw95Eq5KFbghW1A6J/q8j1Q7rv7CYl9JA+h wG+S+07BB++/lwIrvN72h6cUhvMz1Dw1mQ+udbOSN1uyQHAWy3zeSJXOzMectRLFKDXV 5by8Hr//AuiEzdAt5THAAihgdmdzfpsyDnpgYVHD7gGMzSBPoFvE/r6T8hD2BoE0/hHo jUBLculOzIQb0uJiWOkv5Awnxhyke3b3jW8fcGEnkBmWQC9FM7WGPLM2VXY64SMW+LWw WKgmqP/liw5l39qO5BNszAHn1J04VW3exeqy1cjYu1QV/uy2qHTK0i9oUYRPzCsezf+H 41aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749671279; x=1750276079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AfQ1uSWXIil7J+7zJ57XvDKktzBGNsJQ/2rNxebYhh0=; b=KusFwD25aJUrl/wrZ+aqh4hl2kFkZ9/2r52tMNfAxNTLByTQSEOfynBRiGvK5SaKRv t61M5oY9fghcAnUOOZEzrn8FCb41WHYtj08EsHHcAnvgV07NMct+YMkUz7TbiSO5wojQ S8z7o/S2orKpNZTx6kb/KFrWnrDNCO6RTvHpysDLmLB+h1ppp0TZZhE1tMqzx2ZxW2HZ WkaGtCCN273lZnSZrJH1WdeN1yw/QX+oRPH+RCcK1nT1BrIbFYFvlcUzuOG4x3Cw9/O8 532k1bBOaTo4LKZwG7QgEXklzt4Imr/25WZjJChkKkinI8yIEv9dPeV4F4pREuvIDZD3 1UlQ== X-Forwarded-Encrypted: i=1; AJvYcCVDq/MC1+YpmB7srSMNJgVyS16Dacp3J87+7wuNsv09CdpYD0qoYfIoa5WWixi7T2e5uPyTyae4esNaGAQR@vger.kernel.org, AJvYcCXFZH1u/9tpeRYpehf03jDtR89OrtD4FPVf0VQJLyFMhyDod0r4StiwOhNXoPC21K5NE1KUJwhcqnI=@vger.kernel.org X-Gm-Message-State: AOJu0YxMDnDB8gvp4NTQ8HabZgNLWunRF5QFXj0aN4Ow8R+ok8dHDouK aJBAO36engbaMZ3+uPMH9MUxUVk1YvrcElhdTkMxsyaezYcxKbUoKmVP X-Gm-Gg: ASbGncu+ix9zBLHPVtp3NngzxktMOg32eRbNN+nhFRN90aoJ+C1At4PtW7SBM2Gl6yr 5+74QsLN/bvb7ucWfhz4SK/mYIAHrTJLMTx+qeFM27zlXNf+mfZzKsPP+ZKi5cxtykdD7bYkEsL NxIN5gvEJ3P5h2TsCgiMehszg5Pd4d1eb0pjDPjvU9uXvlblss2dODehPWgaSN8QEnhEWGphWQm RIXv3689O0m8F+vL06NlqwZftKTpplJtjgxPSzsoUUbIrL1TV8ezfiV8ahOLzk2DA9OjpoxM74+ 1h1Ma1TorYjZabUbS6FVL7NvWFVN8YdxLEEYVbfXqAVA6iqDiE+hyE60ra8iaMYnChm2WPDkAOR YDmTd X-Google-Smtp-Source: AGHT+IHYOgSp+DMOamhYZzo+8wdSHUOh6c+TRGHTfZxh9sfPbOHLuysN00DZxUK5MBSoj88eOKlNLg== X-Received: by 2002:a05:690c:6aca:b0:710:f55f:7922 with SMTP id 00721157ae682-71150bcd055mr6396627b3.34.1749671278937; Wed, 11 Jun 2025 12:47:58 -0700 (PDT) Received: from delta4.semfio.usp.br ([143.107.45.1]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7115206130csm80587b3.1.2025.06.11.12.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 12:47:58 -0700 (PDT) From: Andrew Ijano X-Google-Original-From: Andrew Ijano To: jic23@kernel.org Cc: andrew.lopes@alumni.usp.br, gustavobastos@usp.br, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, jstephan@baylibre.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 3/3] iio: accel: sca3000: use guard(mutex)() for handling mutex lock Date: Wed, 11 Jun 2025 16:39:21 -0300 Message-ID: <20250611194648.18133-4-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> References: <20250611194648.18133-1-andrew.lopes@alumni.usp.br> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use guard(mutex)(&st->lock) for handling mutex lock instead of manually locking and unlocking the mutex. This prevents forgotten locks due to early exits and remove the need of gotos. Signed-off-by: Andrew Ijano Co-developed-by: Gustavo Bastos Signed-off-by: Gustavo Bastos Suggested-by: Jonathan Cameron Reviewed-by: Nuno S=C3=A1 --- For this one, there are two cases where the previous implementation was a smalllocking portion of the code and now it's locking the whole function. I don't know if this is a desired behavior. drivers/iio/accel/sca3000.c | 177 ++++++++++++------------------------ 1 file changed, 57 insertions(+), 120 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index d41759c68fb4..098d45bad389 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -405,17 +405,14 @@ static int sca3000_print_rev(struct iio_dev *indio_de= v) int ret; struct sca3000_state *st =3D iio_priv(indio_dev); =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_REVID_ADDR)); if (ret < 0) - goto error_ret; + return ret; dev_info(&indio_dev->dev, "sca3000 revision major=3D%lu, minor=3D%lu\n", ret & SCA3000_REG_REVID_MAJOR_MASK, ret & SCA3000_REG_REVID_MINOR_MASK); -error_ret: - mutex_unlock(&st->lock); - return ret; } =20 @@ -699,32 +696,25 @@ static int sca3000_read_raw(struct iio_dev *indio_dev, =20 switch (mask) { case IIO_CHAN_INFO_RAW: - mutex_lock(&st->lock); + guard(mutex)(&st->lock); if (chan->type =3D=3D IIO_ACCEL) { - if (st->mo_det_use_count) { - mutex_unlock(&st->lock); + if (st->mo_det_use_count) return -EBUSY; - } address =3D sca3000_addresses[chan->address][0]; ret =3D spi_w8r16be(st->us, SCA3000_READ_REG(address)); - if (ret < 0) { - mutex_unlock(&st->lock); + if (ret < 0) return ret; - } *val =3D sign_extend32(ret >> chan->scan_type.shift, chan->scan_type.realbits - 1); } else { /* get the temperature when available */ ret =3D spi_w8r16be(st->us, SCA3000_READ_REG(SCA3000_REG_TEMP_MSB_ADDR)); - if (ret < 0) { - mutex_unlock(&st->lock); + if (ret < 0) return ret; - } *val =3D (ret >> chan->scan_type.shift) & GENMASK(chan->scan_type.realbits - 1, 0); } - mutex_unlock(&st->lock); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: *val =3D 0; @@ -738,14 +728,12 @@ static int sca3000_read_raw(struct iio_dev *indio_dev, *val2 =3D 600000; return IIO_VAL_INT_PLUS_MICRO; case IIO_CHAN_INFO_SAMP_FREQ: - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D sca3000_read_raw_samp_freq(st, val); - mutex_unlock(&st->lock); return ret ? ret : IIO_VAL_INT; case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D sca3000_read_3db_freq(st, val); - mutex_unlock(&st->lock); return ret; default: return -EINVAL; @@ -763,22 +751,16 @@ static int sca3000_write_raw(struct iio_dev *indio_de= v, case IIO_CHAN_INFO_SAMP_FREQ: if (val2) return -EINVAL; - mutex_lock(&st->lock); - ret =3D sca3000_write_raw_samp_freq(st, val); - mutex_unlock(&st->lock); - return ret; + guard(mutex)(&st->lock); + return sca3000_write_raw_samp_freq(st, val); case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: if (val2) return -EINVAL; - mutex_lock(&st->lock); - ret =3D sca3000_write_3db_freq(st, val); - mutex_unlock(&st->lock); - return ret; + guard(mutex)(&st->lock); + return sca3000_write_3db_freq(st, val); default: return -EINVAL; } - - return ret; } =20 /** @@ -800,9 +782,8 @@ static ssize_t sca3000_read_av_freq(struct device *dev, struct sca3000_state *st =3D iio_priv(indio_dev); int len =3D 0, ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); - mutex_unlock(&st->lock); if (ret) return ret; =20 @@ -851,10 +832,9 @@ static int sca3000_read_event_value(struct iio_dev *in= dio_dev, =20 switch (info) { case IIO_EV_INFO_VALUE: - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D sca3000_read_ctrl_reg(st, sca3000_addresses[chan->address][1]); - mutex_unlock(&st->lock); if (ret < 0) return ret; *val =3D 0; @@ -918,13 +898,10 @@ static int sca3000_write_event_value(struct iio_dev *= indio_dev, } } =20 - mutex_lock(&st->lock); - ret =3D sca3000_write_ctrl_reg(st, + guard(mutex)(&st->lock); + return sca3000_write_ctrl_reg(st, sca3000_addresses[chan->address][1], nonlinear); - mutex_unlock(&st->lock); - - return ret; } =20 static struct attribute *sca3000_attributes[] =3D { @@ -969,12 +946,12 @@ static void sca3000_ring_int_process(u8 val, struct i= io_dev *indio_dev) struct sca3000_state *st =3D iio_priv(indio_dev); int ret, i, num_available; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 if (val & SCA3000_REG_INT_STATUS_HALF) { ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_BUF_COUNT_ADDR)); if (ret) - goto error_ret; + return; num_available =3D ret; /* * num_available is the total number of samples available @@ -983,7 +960,7 @@ static void sca3000_ring_int_process(u8 val, struct iio= _dev *indio_dev) ret =3D sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, num_available * 2); if (ret) - goto error_ret; + return; for (i =3D 0; i < num_available / 3; i++) { /* * Dirty hack to cover for 11 bit in fifo, 13 bit @@ -995,8 +972,6 @@ static void sca3000_ring_int_process(u8 val, struct iio= _dev *indio_dev) iio_push_to_buffers(indio_dev, st->rx + i * 3 * 2); } } -error_ret: - mutex_unlock(&st->lock); } =20 /** @@ -1022,9 +997,8 @@ static irqreturn_t sca3000_event_handler(int irq, void= *private) * Could lead if badly timed to an extra read of status reg, * but ensures no interrupt is missed. */ - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_STATUS_ADDR)); - mutex_unlock(&st->lock); if (ret) goto done; =20 @@ -1081,16 +1055,15 @@ static int sca3000_read_event_config(struct iio_dev= *indio_dev, struct sca3000_state *st =3D iio_priv(indio_dev); int ret; /* read current value of mode register */ - mutex_lock(&st->lock); + guard(mutex)(&st->lock); =20 ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) - goto error_ret; + return ret; =20 switch (chan->channel2) { case IIO_MOD_X_AND_Y_AND_Z: - ret =3D !!(ret & SCA3000_REG_MODE_FREE_FALL_DETECT); - break; + return !!(ret & SCA3000_REG_MODE_FREE_FALL_DETECT); case IIO_MOD_X: case IIO_MOD_Y: case IIO_MOD_Z: @@ -1100,24 +1073,18 @@ static int sca3000_read_event_config(struct iio_dev= *indio_dev, */ if ((ret & SCA3000_REG_MODE_MODE_MASK) !=3D SCA3000_REG_MODE_MEAS_MODE_MOT_DET) { - ret =3D 0; + return 0; } else { ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL); if (ret < 0) - goto error_ret; + return ret; /* only supporting logical or's for now */ - ret =3D !!(ret & sca3000_addresses[chan->address][2]); + return !!(ret & sca3000_addresses[chan->address][2]); } - break; default: - ret =3D -EINVAL; + return -EINVAL; } - -error_ret: - mutex_unlock(&st->lock); - - return ret; } =20 static int sca3000_freefall_set_state(struct iio_dev *indio_dev, bool stat= e) @@ -1220,26 +1187,19 @@ static int sca3000_write_event_config(struct iio_de= v *indio_dev, struct sca3000_state *st =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); switch (chan->channel2) { case IIO_MOD_X_AND_Y_AND_Z: - ret =3D sca3000_freefall_set_state(indio_dev, state); - break; - + return sca3000_freefall_set_state(indio_dev, state); case IIO_MOD_X: case IIO_MOD_Y: case IIO_MOD_Z: - ret =3D sca3000_motion_detect_set_state(indio_dev, + return sca3000_motion_detect_set_state(indio_dev, chan->address, state); - break; default: - ret =3D -EINVAL; - break; + return -EINVAL; } - mutex_unlock(&st->lock); - - return ret; } =20 static inline @@ -1248,23 +1208,19 @@ int __sca3000_hw_ring_state_set(struct iio_dev *ind= io_dev, bool state) struct sca3000_state *st =3D iio_priv(indio_dev); int ret; =20 - mutex_lock(&st->lock); ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) - goto error_ret; + return ret; + if (state) { dev_info(&indio_dev->dev, "supposedly enabling ring buffer\n"); - ret =3D sca3000_write_reg(st, + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, (ret | SCA3000_REG_MODE_RING_BUF_ENABLE)); - } else - ret =3D sca3000_write_reg(st, - SCA3000_REG_MODE_ADDR, - (ret & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); -error_ret: - mutex_unlock(&st->lock); - - return ret; + } + return sca3000_write_reg(st, + SCA3000_REG_MODE_ADDR, + (ret & ~SCA3000_REG_MODE_RING_BUF_ENABLE)); } =20 /** @@ -1281,26 +1237,18 @@ static int sca3000_hw_ring_preenable(struct iio_dev= *indio_dev) int ret; struct sca3000_state *st =3D iio_priv(indio_dev); =20 - mutex_lock(&st->lock); - + guard(mutex)(&st->lock); /* Enable the 50% full interrupt */ ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) - goto error_unlock; + return ret; ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, ret | SCA3000_REG_INT_MASK_RING_HALF); if (ret) - goto error_unlock; - - mutex_unlock(&st->lock); + return ret; =20 return __sca3000_hw_ring_state_set(indio_dev, 1); - -error_unlock: - mutex_unlock(&st->lock); - - return ret; } =20 static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev) @@ -1308,22 +1256,18 @@ static int sca3000_hw_ring_postdisable(struct iio_d= ev *indio_dev) int ret; struct sca3000_state *st =3D iio_priv(indio_dev); =20 + guard(mutex)(&st->lock); ret =3D __sca3000_hw_ring_state_set(indio_dev, 0); if (ret) return ret; =20 /* Disable the 50% full interrupt */ - mutex_lock(&st->lock); - ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) - goto unlock; - ret =3D sca3000_write_reg(st, + return ret; + return sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, ret & ~SCA3000_REG_INT_MASK_RING_HALF); -unlock: - mutex_unlock(&st->lock); - return ret; } =20 static const struct iio_buffer_setup_ops sca3000_ring_setup_ops =3D { @@ -1343,25 +1287,25 @@ static int sca3000_clean_setup(struct sca3000_state= *st) { int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); /* Ensure all interrupts have been acknowledged */ ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) - goto error_ret; + return ret; =20 /* Turn off all motion detection channels */ ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL); if (ret < 0) - goto error_ret; + return ret; ret =3D sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL, ret & SCA3000_MD_CTRL_PROT_MASK); if (ret) - goto error_ret; + return ret; =20 /* Disable ring buffer */ ret =3D sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL); if (ret < 0) - goto error_ret; + return ret; ret =3D sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL, (ret & SCA3000_REG_OUT_CTRL_PROT_MASK) | SCA3000_REG_OUT_CTRL_BUF_X_EN @@ -1369,17 +1313,17 @@ static int sca3000_clean_setup(struct sca3000_state= *st) | SCA3000_REG_OUT_CTRL_BUF_Z_EN | SCA3000_REG_OUT_CTRL_BUF_DIV_4); if (ret) - goto error_ret; + return ret; /* Enable interrupts, relevant to mode and set up as active low */ ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) - goto error_ret; + return ret; ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, (ret & SCA3000_REG_INT_MASK_PROT_MASK) | SCA3000_REG_INT_MASK_ACTIVE_LOW); if (ret) - goto error_ret; + return ret; /* * Select normal measurement mode, free fall off, ring off * Ring in 12 bit mode - it is fine to overwrite reserved bits 3,5 @@ -1387,13 +1331,9 @@ static int sca3000_clean_setup(struct sca3000_state = *st) */ ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); if (ret) - goto error_ret; - ret =3D sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, + return ret; + return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, ret & SCA3000_MODE_PROT_MASK); - -error_ret: - mutex_unlock(&st->lock); - return ret; } =20 static const struct iio_info sca3000_info =3D { @@ -1471,19 +1411,16 @@ static int sca3000_stop_all_interrupts(struct sca30= 00_state *st) { int ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_INT_MASK_ADDR)); if (ret) - goto error_ret; + return ret; =20 - ret =3D sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, + return sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR, ret & ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER | SCA3000_REG_INT_MASK_RING_HALF | SCA3000_REG_INT_MASK_ALL_INTS)); -error_ret: - mutex_unlock(&st->lock); - return ret; } =20 static void sca3000_remove(struct spi_device *spi) --=20 2.49.0