From nobody Thu Oct 9 10:49:44 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 3E7F31D88A4; Wed, 18 Jun 2025 03:17:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216651; cv=none; b=klFqfjPvd61RXNX0jM/6DrJkbFhTDIEGNRHmE+N5naG5D0P/fc6/croAiPhLTQRrYgY/FgyBzQQlXqszODVheFzEH6K8fzQZ6w5GE9hZAUkxqYUOmMVygmy2Xh36XfuH0RkKuccn7q4kFZTdNvNsNLYfNG9cncWz1Pmt6o67ArU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216651; c=relaxed/simple; bh=K4mkFXPR5RVIaI8OVBq6n+HJilkj6RKa5cQixSoKpxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U7i/PhuN0DqLKexOaXs9WzwJHdOvkw14nDapsGX7M0fOapgzv+OCxqSSwH6Po6Hw5LmO0IGCaId5dHc7Eh+iuqCqJX2du2yiwHdKAm1ZCH3qd1vU3oQTFRRCjx489ZUeewuWhPWdSQYO0RdmALonk8oi2VyvHcO4xn+N8Vo8I4E= 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=lrFUEXt5; arc=none smtp.client-ip=209.85.214.177 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="lrFUEXt5" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-235e1d710d8so79977885ad.1; Tue, 17 Jun 2025 20:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750216648; x=1750821448; 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=YCe9O75l1lXpId/iHwtAGjSH/WRH6ycIZoI9+EJlbAE=; b=lrFUEXt54aL6j3/jiKfimw6gSX9Bo5ww6dxb7Ogl99vJvHrT8EbPadDSi+MGf+lkJ/ gUYa9y+HmsNCwHpe3Esbn9913/2C4QLGRn7wspLxsUSzST/+3zoJTtBkKkwYb6lI9ylM +PEOtHsTfoUWLP8z5d9B4OumJsUsVg9iDb5sp67ef5S0UdIDrxpYQ3YQ0avATeaeERwU B46xonAlrYD/XzllBQ1o0nrPFZ6/trrgvEQs2eNMqRIN+dd1kbGHmskb7ZadStm5C2wm MaY10ZJ+6pKmyb76Dv4f0OAPZuI0N5LHyA+mw+hAWzsQ0eCCDjRaZKC6Yi5WveiD1DFy /2vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750216648; x=1750821448; 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=YCe9O75l1lXpId/iHwtAGjSH/WRH6ycIZoI9+EJlbAE=; b=ZPuV90ghgpKfk8X0yu+KZveg3UK71YftNwUqUYOA6FXwPgXj5LsnyWRMk2535nu3ed ZyOX1fsiIsGIUnU24MYQO0mlKhKrcj7bqd0OoOLglU66b9jBYWV61/2IXQ2rT8N7CIQd UV0mBFMuoED/Wi9FeR4jR9HGh9FwVGEC6m++8HVoBOduYy8QBQgT/IcflYioG9lxv4ao gCPf2iJwOk6nw5IblqUk0nR1z0dUGbnvWuqsjNxZPQVlk0wRObVGuCvZfYpLGe0INQmd XlzVPaH08ISFcL60dHwQf68hvSVaDLRAQrjhktIauD/ByMFStfiuOBbEd455Ig2hG4th JWeQ== X-Forwarded-Encrypted: i=1; AJvYcCWOq6lTmnLYzrsEC/1yPeubp7rVw53Cuz0ux3oklxWOl/EQWLmiyAu1IWRAfHxZ/zQdYX39oM7ADZs=@vger.kernel.org, AJvYcCWRwsj70eXUjE8j6OwNqa2p7yYnHJtAFCzfa4QKufYYTk5Rnun4fjJmaBmVabQyTcEPRCIekZ90EenUdNtm@vger.kernel.org X-Gm-Message-State: AOJu0YyAVDGQztoxIAidH2L8LNzLGB0CxJXnAX8tyLL9RGKb2kzHzNoB 8z0K54WwF62I9x7ZifgpIg0DMoHTm8tHH9gj/KfpvzAHXAaewSy3HF5i X-Gm-Gg: ASbGncsPuWhrptL1bOROmQyvbBvgXgX07DLkO77lI2SCjrbcZOgvVs+qTs+qH+I6IdE L80PE56XIJs/FtIHkvJoXf6uQP4g/YIjkH+59xc5IQNWdTRo0cJuBjtO8iZRLj6ZW1SPH4iyU65 ehtseqV/lgKBVY/+GCPGSLRdVGa4xjB0ttjjIlddMtxPkPsIHuPNSTAkYhX9JMVGPv6h3aesk3s hZZdaENMOSob6J0GmcmAP8Z0kkpZd4x17+QD749/FqUNQb2jIfHUjh20eqdu7yoPDAxLcM1ic9o RsgcWbj9tyoVH69nXDsu8VaafWy8jaAd1FUUn/3vn4M3JresU59k8qyNc9xkKT87LQ== X-Google-Smtp-Source: AGHT+IGVrqDaywlxdJmEWpv+1cSFi4lsp78ym2fwnS4sY7mbHX+6662L4yf8pmmNd7ohVbPfGoCjsw== X-Received: by 2002:a17:903:1d0:b0:235:ed01:18cd with SMTP id d9443c01a7336-2366b3f851amr256115545ad.44.1750216647887; Tue, 17 Jun 2025 20:17:27 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:31:2ce1::1005]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365dfdb9a0sm89179545ad.239.2025.06.17.20.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 20:17:27 -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 v6 1/4] iio: accel: sca3000: replace usages of internal read data helpers by spi helpers Date: Wed, 18 Jun 2025 00:12:16 -0300 Message-ID: <20250618031638.26477-2-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618031638.26477-1-andrew.lopes@alumni.usp.br> References: <20250618031638.26477-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 sca3000_read_data_short() function, replacing it by spi_w8r8() and spi_w8r16be() helpers. 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 reviewed-by tag. --- drivers/iio/accel/sca3000.c | 152 +++++++++++++++--------------------- 1 file changed, 63 insertions(+), 89 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index bfa8a3f5a92f..c85a06cbea37 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,21 @@ 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 +797,16 @@ 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; + unsigned int len =3D 0; + int 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, @@ -1001,11 +976,10 @@ 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. @@ -1045,7 +1019,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 +1027,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 +1043,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 +1052,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 +1061,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 +1087,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 +1102,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 +1130,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 +1180,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 +1253,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 +1288,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 +1319,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 +1349,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 +1375,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 +1389,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 +1476,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 Thu Oct 9 10:49:44 2025 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 067B81DD9AC; Wed, 18 Jun 2025 03:17:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216653; cv=none; b=iDZ4EESghewLqX0VyokGMIbjWM/n9wl14ntgB4SwcuJzMNK1yDBBK00qPblpWy8E7hVNWC3Irm6NpFsDqpI5HV+LLJOfkVCBDR6FfVXYwPr8BFkU40RDatdGx194yAPiV5X0loI+G0I/GHQ0tW+8Rz6mSVHqdH9TIery0TubytE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216653; c=relaxed/simple; bh=9WOaxE3LCm/+eHOUl/ASfJhT6s3N74YJM4Mwqqwh3rE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kkVci9IHw+BuUEBUjadnAthq6MnoGv69G1be7E/LRKvstnIDv59PmL1g6Ib5Y7ty6LkGzlrXBKRVpgD8hAKMl9ZLFyEluH0NkNdq3b8dp6LYBvqALBhAn8V3eCrZvotXjla7Q7xUHREolrnYQOf2bRsJqEpB5fSdJrVQMvxC5Ic= 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=jgVIqmxb; arc=none smtp.client-ip=209.85.214.174 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="jgVIqmxb" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-23633a6ac50so93669315ad.2; Tue, 17 Jun 2025 20:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750216651; x=1750821451; 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=QL915nnifSKujTPSpiOOuMQduAOxvrKpwnj9qgnMTJ4=; b=jgVIqmxbu2scvCd7BFro0wd48chaTG/kBY88vgXacc+e3ZpMxH1BySvyRwfiQ+PH91 T61+jpAko8QblbY66am8kL3lVpE57VAMjN2Ltw0UB0D2IHsHeWnrwcwaeCyMwwvqxrlX rWb8PYC7jpRRozz4nwyy28qeh6OaBZbTVP06/2SAb1GAEDNsq8F6hXJ5wLnzzdhUNRIn 3h85/mSZW6ot8nEXmLhzR2OWxVga8hw/R8d67ZsjPUkqaV3ystIhgfyCr1stBld4ezQ6 qribZyni2GouM1V4R0fJsV4qedSPmHMCtFVqzj/KG4/0k6ukXgAhAesXG++RSjL6H5hL d02Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750216651; x=1750821451; 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=QL915nnifSKujTPSpiOOuMQduAOxvrKpwnj9qgnMTJ4=; b=NTsdgYKGOeLiq0eVtZxEStDVrYTs3DDsvqI2ve1dbgGsClcuv0fe3eTgkOCy89AFNd 2H30AaTSS28Rm286YtB48sW6hd0kS+QKe27yBONnongTqm2SY61kXQN3r3gnKzu2zrjs H0V/6NBgiZ+MjlRYU/4bmfykEfAjmqHa9llG8ZLX5tqdciJYTtOyPu1Wv+vnL8NjyZ7X E5E+uWzcy7Y2H6Q+mvlRqsNmqiR6ciVeus/RPMctaRh2ng2qzBu5qOXg+/sVlseeGjEr Vp+IoJ+qzpHoq+2OzjzvG2wP48G5YePQ3SCLINMnQIOgA5IOBKtlPJRU2y+yoGGqCdRm 6n5Q== X-Forwarded-Encrypted: i=1; AJvYcCWNlXjwc50epzsMa6b0zTLvyuCyHdVK8iV6ATBG1rXX1NvxuM1T7pGNH+hs6vANT01EleNbZRjcQLl/4dDE@vger.kernel.org, AJvYcCWn9gLTHeA9k/vuEdAkzprHtfztouShgO4sCcsRCOr4HeziwUbD134ploFN0f6n0omPgg4QVn1+coM=@vger.kernel.org X-Gm-Message-State: AOJu0YyqqR7J2uF5C6fovuOA+X0pKm2mMFaoINGAz588KOYgBr/GySH/ h6NOgx66/UH1kZwM/Htnb67cOlM34rlOnto4HVRk50IAz9su6py7jC3I X-Gm-Gg: ASbGnctMIC2GfzJ/gdTw6r2kBjKhAIgy1SILy8nZPfuuFxb4ktuvgCXHECwbGYkKH55 U4v3zA7cqPGHbfTQCaKpdcalm5ETBvdIHWqVOrTWSb2mUcvkcRXiswglggIQcY9yYj/OE8+Sd1R 1q8pAundPAJzjjBsaR8VcsnlgWXuOyDa99iKSIwI9nML/ZvvRQuEQyFfn2dT+Pe/ktv0lZoQ9Xr 6D6TVOkVIVRh1kTq7s+8VcLRH9+ohNq9C2MZPC+iA/ErBKuz9a5DkVywqylesR3kwoRRBG/cjkj kyPOPqMxhu8FIBdaaW5rdWIfua42AUWlXCeeKLh3HG4gENCAF9c2NyTi0y9zthWG1A== X-Google-Smtp-Source: AGHT+IGevqF23RYle86b3gblSZ2n1YkwD8f203Lu+qLcDNwukM+M7pNeux2fhYFE+uTv2RfU7e5NIw== X-Received: by 2002:a17:902:ea0d:b0:234:8e54:2d53 with SMTP id d9443c01a7336-2366b3f8713mr237977515ad.45.1750216651231; Tue, 17 Jun 2025 20:17:31 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:31:2ce1::1005]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365dfdb9a0sm89179545ad.239.2025.06.17.20.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 20:17:30 -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 v6 2/4] iio: accel: sca3000: clean sca3000_read_data() Date: Wed, 18 Jun 2025 00:12:17 -0300 Message-ID: <20250618031638.26477-3-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618031638.26477-1-andrew.lopes@alumni.usp.br> References: <20250618031638.26477-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" Clean internal sca3000_read_data() helper by removing unnecessary arguments and return logic. Signed-off-by: Andrew Ijano Co-developed-by: Gustavo Bastos Signed-off-by: Gustavo Bastos Suggested-by: Jonathan Cameron reviewed-by tag. --- drivers/iio/accel/sca3000.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index c85a06cbea37..7145b4541264 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -939,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; @@ -949,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, } }; =20 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 /** @@ -984,8 +980,7 @@ static void sca3000_ring_int_process(u8 val, struct iio= _dev *indio_dev) * 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, - num_available * 2); + ret =3D sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, num_available *= 2); if (ret) goto error_ret; for (i =3D 0; i < num_available / 3; i++) { --=20 2.49.0 From nobody Thu Oct 9 10:49:44 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.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 3B6D31E0E14; Wed, 18 Jun 2025 03:17:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216657; cv=none; b=HzOdDRdWTIVuIX9+u+NiXLRim6bIPxdQsxG+pd7gCTTKWvTY2C/AjAmuvSbZKyazg7ZJ0PFw+tmLTHLRDGiNC0EqyEFRZHWwjVASpdIxGVJgJnJ0IvxUHDBPXGVLUUy6gorUoJNcXoVANEcsMC9WSs/n4kfI8bazWsIDqr+AkSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216657; c=relaxed/simple; bh=3X6iautA+rVq3UozUsQR5OdIV798z6KvJHqgvAc0V3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=asKbBmhavSavB0vRL8f2DomW4+3HitSK91GJAB0AwQzqc11jM3/j2/HsTy+Kz3H/1rAqFIDaHPyWA2TiPSK/oSTv8cjsKoMF5zIgRqw/pdkIghBBdlh2iIRYWWd63gR4W4GT9Gswxlk0sWZFdmV+36ulIjCjMfLUgaLBeJxB2YA= 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=inScrJFJ; arc=none smtp.client-ip=209.85.214.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="inScrJFJ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-236377f00a1so57468475ad.3; Tue, 17 Jun 2025 20:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750216654; x=1750821454; 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=e8NHjy30QYpMH8wGk4U2AA90RBMYfc/a+wEG/dD30AY=; b=inScrJFJIr9vkHWKxGsauiY/+wZbx8pzNvqRforiuwXSjNc4P4LDMtaVn1DofUJnQj jK518TmrqY4Uvgv9u2/SoLn+jSGvoyyGDNpXJUTrFHJfP49QUOdmnmfLK+v6XgCxeHQ4 XFOK9ZJslvKaaN86+XOYBIkwyNdXgXsR0oReA7qm2OCwXN7q6/LIPmbv3fi0gPkFJZRd Ear0TGf2cOwG5KKphjbWPT9EP1j29JP9rbrGvBdeYaEtU+kJ4hwtEE7ISXBvDvyN3S2t cTFoXVw9MvrhvArM4NsUeME6jNpsjXqSTtrx3f2H0BgyhKrw9+XBS85mkQcn83FsTu1j vbQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750216654; x=1750821454; 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=e8NHjy30QYpMH8wGk4U2AA90RBMYfc/a+wEG/dD30AY=; b=aMD+ps7keCZwBSfd6d5TPuooFW2l/d+qWmuG5KKKlL1jEzpj3twRXb0Iqh0IdRbJgR UiZSvNV7ex4w//ykVgaOCl8rZxQFFfJ3gUXWPRLtMlSW6i7y1a1grlpK1LeIZye6zGyA /5Jt75jGnyga3BjC09XymmC2p9NG+GxpIeW9mnnVTX4eCUfayCImKi4oz848m1S4CBN1 vFQT7TWuLARueObkzvNcDhQeBXS5MopBn8IFcHseP52Fz1J/mi25YHlVQT0Ck14uM1G1 /J+lZqdPrJWz0s0adcKIKRfy8OGpyz1zoe75whXDG9qMwzA8KMkES9gAM16QEEwgMRVJ LQMA== X-Forwarded-Encrypted: i=1; AJvYcCUXBhN6gcdle/R3ODltOOsYsqETCZ4J52IBTqAcARO4wjEH4olHf4Am3OAGFaTYe7qFSLcDrCH5HkXetOOD@vger.kernel.org, AJvYcCWmlYgE5G3Q2XddS5GDvVNxtU9UBO6bpEwlba/3RltCZVG0c4xlh1utLr/519HfVjilKsXy8W41DRM=@vger.kernel.org X-Gm-Message-State: AOJu0YzocCus6Z3gfdV+dG+W5IwuxLKNFjKRqKzlsNXP9zPtRvP1+BVR QsAnGgyk3FdJqhV14S1Zj6mK5L3BzWWmBWLnaSnhf7ijE7GZwBtYbfFG0CRBBrMnJS0= X-Gm-Gg: ASbGnctiJzxJ1CJPMLHnxOB2pdhw39VLt0jYFwUBFUKmdp9kD42xLy90f7/Fo7vJPgj W4sUcsDBA1temF+uj8trVvCQDzG0LCuaiBWXykqNbBEyhKVc2/Hclqi0EEqx5alBz7wFl+346d0 VBhaQmFBxaaKec7PRGy74bco9vQjEXWPyLewZK9FhuszW74oQ/QIq/WwJWBL0ln5UH2W5eKLDyB vTELMh2//xxAmNRgpG3JK5fVvF6Nc5gJFfDtP1ifwhDEUW18ApK5HjS/G2W2qc/OTuVxUzaXLnl V5LR9krqTuAGxH6IN+Xhqesdoddbtq+y//sdj/PnhYhZHQSdc8QmWifUQzQeG7uJ0Nmsar7klRw y X-Google-Smtp-Source: AGHT+IFmay82+G/zjZfNTuj6UJ34TQdi2pCailaGSIe8wpnlN+6szQHKVCzTMVLDc0M8QtTakVsszA== X-Received: by 2002:a17:902:c943:b0:223:4d7e:e52c with SMTP id d9443c01a7336-2366afbe6afmr248707325ad.5.1750216654430; Tue, 17 Jun 2025 20:17:34 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:31:2ce1::1005]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365dfdb9a0sm89179545ad.239.2025.06.17.20.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 20:17:34 -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 v6 3/4] iio: accel: sca3000: use lock guards Date: Wed, 18 Jun 2025 00:12:18 -0300 Message-ID: <20250618031638.26477-4-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618031638.26477-1-andrew.lopes@alumni.usp.br> References: <20250618031638.26477-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() and scoped_guard() 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 tag. --- drivers/iio/accel/sca3000.c | 205 +++++++++++++----------------------- 1 file changed, 73 insertions(+), 132 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index 7145b4541264..058a2d67c91c 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 @@ -698,33 +695,27 @@ static int sca3000_read_raw(struct iio_dev *indio_dev, u8 address; =20 switch (mask) { - case IIO_CHAN_INFO_RAW: - mutex_lock(&st->lock); + case IIO_CHAN_INFO_RAW: { + 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; if (chan->type =3D=3D IIO_ACCEL) @@ -736,16 +727,16 @@ static int sca3000_read_raw(struct iio_dev *indio_dev, *val =3D -214; *val2 =3D 600000; return IIO_VAL_INT_PLUS_MICRO; - case IIO_CHAN_INFO_SAMP_FREQ: - mutex_lock(&st->lock); + case IIO_CHAN_INFO_SAMP_FREQ: { + 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); + } + case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: { + guard(mutex)(&st->lock); ret =3D sca3000_read_3db_freq(st, val); - mutex_unlock(&st->lock); return ret; + } default: return -EINVAL; } @@ -756,28 +747,23 @@ static int sca3000_write_raw(struct iio_dev *indio_de= v, int val, int val2, long mask) { struct sca3000_state *st =3D iio_priv(indio_dev); - int ret; =20 switch (mask) { - case IIO_CHAN_INFO_SAMP_FREQ: + case IIO_CHAN_INFO_SAMP_FREQ: { + guard(mutex)(&st->lock); if (val2) return -EINVAL; - mutex_lock(&st->lock); - ret =3D sca3000_write_raw_samp_freq(st, val); - mutex_unlock(&st->lock); - return ret; - case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: + return sca3000_write_raw_samp_freq(st, val); + } + case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: { + guard(mutex)(&st->lock); if (val2) return -EINVAL; - mutex_lock(&st->lock); - ret =3D sca3000_write_3db_freq(st, val); - mutex_unlock(&st->lock); - return ret; + return sca3000_write_3db_freq(st, val); + } default: return -EINVAL; } - - return ret; } =20 /** @@ -800,9 +786,9 @@ static ssize_t sca3000_read_av_freq(struct device *dev, unsigned int len =3D 0; int ret; =20 - mutex_lock(&st->lock); - ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); - mutex_unlock(&st->lock); + scoped_guard(mutex, &st->lock) { + ret =3D spi_w8r8(st->us, SCA3000_READ_REG(SCA3000_REG_MODE_ADDR)); + } if (ret) return ret; =20 @@ -850,11 +836,10 @@ static int sca3000_read_event_value(struct iio_dev *i= ndio_dev, int i; =20 switch (info) { - case IIO_EV_INFO_VALUE: - mutex_lock(&st->lock); - ret =3D sca3000_read_ctrl_reg(st, - sca3000_addresses[chan->address][1]); - mutex_unlock(&st->lock); + case IIO_EV_INFO_VALUE: { + scoped_guard(mutex, &st->lock) { + ret =3D sca3000_read_ctrl_reg(st, sca3000_addresses[chan->address][1]); + } if (ret < 0) return ret; *val =3D 0; @@ -868,6 +853,7 @@ static int sca3000_read_event_value(struct iio_dev *ind= io_dev, *val +=3D st->info->mot_det_mult_xz[i]; =20 return IIO_VAL_INT; + } case IIO_EV_INFO_PERIOD: *val =3D 0; *val2 =3D 226000; @@ -898,7 +884,6 @@ static int sca3000_write_event_value(struct iio_dev *in= dio_dev, int val, int val2) { struct sca3000_state *st =3D iio_priv(indio_dev); - int ret; int i; u8 nonlinear =3D 0; =20 @@ -918,13 +903,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 +951,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 @@ -982,7 +964,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 @@ -994,8 +976,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 /** @@ -1021,9 +1001,8 @@ static irqreturn_t sca3000_event_handler(int irq, voi= d *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 @@ -1080,16 +1059,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: @@ -1099,24 +1077,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) @@ -1217,28 +1189,20 @@ static int sca3000_write_event_config(struct iio_de= v *indio_dev, bool state) { 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 @@ -1247,23 +1211,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 /** @@ -1280,26 +1240,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) @@ -1307,22 +1259,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 { @@ -1342,25 +1290,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 @@ -1368,17 +1316,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 @@ -1386,13 +1334,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 { @@ -1470,19 +1414,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 From nobody Thu Oct 9 10:49:44 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.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 3B6941E570B; Wed, 18 Jun 2025 03:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216659; cv=none; b=FmUgZ+NEja2PJhU5F1YZWlkalz67oY2IIebTr4u/gXD/4hVGRq1jRilDNsHj/Pmx+8fCa8dd5i7nUGlOkCIoaoiQCMuLLvgchDsKsqBCuFzc//DaUOMpk0hYvZzDbtUfdpoPzrBJUhudSXrsKaOahr0kCdIcKp0OhbOEC6w+rTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750216659; c=relaxed/simple; bh=frXSwGyAwc4d5PustjEWkRKMKwS0wTKpGhI/9vpq8RY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nU6d8uJZWfIyFDwxLqpqohxc1TN3wkBas/xwHdl4xGaOq1S7T+Ji5EH13gvBWeiqPgpPnaUFkDfjsKMfac4GSabDsCu3h2mhRi+vGDD58SeLb9l0yKagA7QCQMZf345MHh9bkIyv6jgz5zmN6btomHQlx3V0bA0hytfQdSag7Lw= 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=U6y93rDz; arc=none smtp.client-ip=209.85.214.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="U6y93rDz" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-23602481460so63371835ad.0; Tue, 17 Jun 2025 20:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750216657; x=1750821457; 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=AmGxDv3sNPfFZwxb3O8lpt0uVGYhHyGdSY0M4odFR0E=; b=U6y93rDzn46lNezgRat+FonPqT7/eN7UIQ/0kehPUgsw0zoEJ+Gmb1BfBmN1NU32rA cCDap6WxTFxX8wjE6gBGdoyZtILjJpmxlus3NUyxNXtPNByrl0Htw/cYpyaAReY8Muqv F1kceEzpCPJuZxr93vvUKHosJj7bD+1cb+2lF1DALVeLkQBCZ8S/uBIBIBDpxPeF8QCd Kt91k11DRsIeb33966iLbcla6k2OYnMJSaxCUpwUHdNpyZdTD3aLW41YN8PkbvvD+h5n 8Q4iv7pUvtF4jNofGYUlVwTlHInuXjbwoNP23X1cNKcryzDCr+rMyCItuAXe2D5CbV45 ef8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750216657; x=1750821457; 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=AmGxDv3sNPfFZwxb3O8lpt0uVGYhHyGdSY0M4odFR0E=; b=SGCeFWLXwu4n+HnuCM1oVrSDEKkk1wNQ/k7YaWLNevJ8sx+F/SJnpAtgOopktpJgtv LpfSeJiCj7SP3lxYZ3sI0z533h0jN6JiPuIxyTBvEn5aqV92ELe3ZB8l3UcNkiqLG65p F7Z1RHO9bTnIGPUc1gnJgJOnOw+GjqZTjI6kNvUdWuUqJgsY5QCik0H/luFqq3VHsll0 6SBh0kVK74NYcGL//4pTm0ylA/buVEsagiORAr6MyMQp+i9QCtsIHwlDEvNtIhAZ/0s7 OJB7MxikNOtjLrbXjDYa9A2axRR1ok5efA8CdR97M4hEgphftXsp55EeP95VnE/Lvr5Q K7HQ== X-Forwarded-Encrypted: i=1; AJvYcCW/AHwEgCmYqM1NuExrY50uieGWWHkykPJoG9zqGjHweuTwhSHg0j42FVruNXx/hx75k9LLLYBwIns=@vger.kernel.org, AJvYcCWG+yrNYsVUtTQhcg2QmIvnrO1NXHUGISlzx9+Kil7N7AjfR09XbKraNMLXA04Va2VBNGq3A+1zqTFyXgJd@vger.kernel.org X-Gm-Message-State: AOJu0YyUH/I3kz864h9mLpCVVDuC3K0WeCn0basHsMuElyUa96nV423X vyh2Qgbe6ka91bdkZZMFf1IUlRS24UW0yh+aq0Cf7GCvsCaPrJ83HyEH X-Gm-Gg: ASbGncuwMYy9Fmm+2875Gf9NAFBDsx35jpVZ9z6A8fRZuYv/cpkhv0gmYULLcBbQZjF T8o+bz5D0YVLjy+r/8ECUhNbdTm+Qyjsqrit2M+W725rKZAFWTmnTGdUDRa/qIDN2m7JLkDZcAx 4KyKml6HfFS1kqpOMPAPx0BB2QbgKq4qJADPEFNiQVSp1h/NrbULlzO66Q49ujkwXbnxX9QQncW h3hFKWS9tdAGfa8oZQ8Xtfy9ds5bGqlV+xNyHhakSyxZv3wmXSxWJ72SErVqV8Dcj8PQ9bN7SYo uKLfuWjJZg7uPduEZjDX8J902gyjnVA8XduwIH8qZKYNlkLqm1hnzFqa1LNodOUi2Q== X-Google-Smtp-Source: AGHT+IEnOivJGUDWqVyOIV9MXtZf3Bc3o1rhJEC9EwSqChNJtE1AmlhKQp6mD4GytzYsZ/GtITfOGg== X-Received: by 2002:a17:902:f68e:b0:234:cf24:3be8 with SMTP id d9443c01a7336-2366b12f541mr264432915ad.28.1750216657570; Tue, 17 Jun 2025 20:17:37 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:31:2ce1::1005]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365dfdb9a0sm89179545ad.239.2025.06.17.20.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 20:17:37 -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 v6 4/4] iio: accel: sca3000: use sysfs_emit_at() instead of sprintf() Date: Wed, 18 Jun 2025 00:12:19 -0300 Message-ID: <20250618031638.26477-5-andrew.lopes@alumni.usp.br> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618031638.26477-1-andrew.lopes@alumni.usp.br> References: <20250618031638.26477-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 sysfs_emit_at() instead of sprintf() for sysfs operations as suggested in the documentation, since it is aware of PAGE_SIZE buffer. Signed-off-by: Andrew Ijano Suggested-by: Andy Shevchenko Suggested-by: Jonathan Cameron reviewed-by tag. --- drivers/iio/accel/sca3000.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c index 058a2d67c91c..bc0046b19511 100644 --- a/drivers/iio/accel/sca3000.c +++ b/drivers/iio/accel/sca3000.c @@ -423,16 +423,16 @@ sca3000_show_available_3db_freqs(struct device *dev, { struct iio_dev *indio_dev =3D dev_to_iio_dev(dev); struct sca3000_state *st =3D iio_priv(indio_dev); - int len; + unsigned int len =3D 0; =20 - len =3D sprintf(buf, "%d", st->info->measurement_mode_3db_freq); + len =3D sysfs_emit_at(buf, len, "%d", st->info->measurement_mode_3db_freq= ); if (st->info->option_mode_1) - len +=3D sprintf(buf + len, " %d", + len +=3D sysfs_emit_at(buf, len, " %d", st->info->option_mode_1_3db_freq); if (st->info->option_mode_2) - len +=3D sprintf(buf + len, " %d", + len +=3D sysfs_emit_at(buf, len, " %d", st->info->option_mode_2_3db_freq); - len +=3D sprintf(buf + len, "\n"); + len +=3D sysfs_emit_at(buf, len, "\n"); =20 return len; } @@ -783,7 +783,6 @@ static ssize_t sca3000_read_av_freq(struct device *dev, { struct iio_dev *indio_dev =3D dev_to_iio_dev(dev); struct sca3000_state *st =3D iio_priv(indio_dev); - unsigned int len =3D 0; int ret; =20 scoped_guard(mutex, &st->lock) { @@ -794,25 +793,22 @@ static ssize_t sca3000_read_av_freq(struct device *de= v, =20 switch (ret & SCA3000_REG_MODE_MODE_MASK) { case SCA3000_REG_MODE_MEAS_MODE_NORMAL: - len +=3D sprintf(buf + len, "%d %d %d\n", + return sysfs_emit(buf, "%d %d %d\n", st->info->measurement_mode_freq, st->info->measurement_mode_freq / 2, st->info->measurement_mode_freq / 4); - break; case SCA3000_REG_MODE_MEAS_MODE_OP_1: - len +=3D sprintf(buf + len, "%d %d %d\n", + return sysfs_emit(buf, "%d %d %d\n", st->info->option_mode_1_freq, st->info->option_mode_1_freq / 2, st->info->option_mode_1_freq / 4); - break; case SCA3000_REG_MODE_MEAS_MODE_OP_2: - len +=3D sprintf(buf + len, "%d %d %d\n", + return sysfs_emit(buf, "%d %d %d\n", st->info->option_mode_2_freq, st->info->option_mode_2_freq / 2, st->info->option_mode_2_freq / 4); - break; } - return len; + return 0; } =20 /* --=20 2.49.0