From nobody Fri Dec 19 20:42:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD64663CAE; Wed, 13 Mar 2024 16:43:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348199; cv=none; b=SY2QC78cpk+xHvILoMCfcxGG8G+2JQUpm5clwMAu419n5/z6kRayQSHQio82qGn57sAxjH0fsaCDdMxBwwHbCdp4bgeohcAEF7cDRytWxFVOMfI74tmr9+EhznSYWnBbwYAZB99Kz4rLbEixujGw7WhC2pCFe46qPf0phOFNP4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348199; c=relaxed/simple; bh=uL4wRVagRog8IuUH9Dd2Z/ogV6B19zOQMfGMFLV9ap8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BbCQst7jX6/EGoqMf1STi9jY7YUkr7L9vVukXQYSzm3skp2D6WZs+UzX4Y3LJy0l0oAOc3AzNTyrz6MZxDIE2/uvJS+LWfKFTY2E77arYo3msiIC0Ie993UzacV+OC9AKIoOfvFI60wQzYf28NZaBTlMl37LB/N/fRrT5yBxkiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZV80LE8k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZV80LE8k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8803C43394; Wed, 13 Mar 2024 16:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348199; bh=uL4wRVagRog8IuUH9Dd2Z/ogV6B19zOQMfGMFLV9ap8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZV80LE8k9WFTWly+QxQNB0AL8FvO1286bBTDDoTB3SHMG3UvpPBN9M2rBSGrs+57t W23G6MQPpahLI6hTKKqdWiyk8Eam8lesUoMaxk8NtAsV8b1zwy8t4IiodC8lEUVuVH oQtZcAWJq7DHSxBCvoDxnjC9EG1kYD0NpStTW3xQKcI4uUE3pD3z/6ybhqbEaZQRer l0s+LGDJ7Bzs9UnbXuGgX13k0m0lHUBkt7jMTV1aGz8wIt7VoBNHTaKIRYDPhnrUoe D+DrfDPv3AMU9dyO7Q0P6ur2cMWZeCjwkfNVz3QW3HtCY5zhv7hYrcEl4p9zqxv2Xb MRrqtsOZMyHvQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cosmin Tanislav , Andy Shevchenko , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.15 48/76] serial: max310x: use regmap methods for SPI batch operations Date: Wed, 13 Mar 2024 12:41:55 -0400 Message-ID: <20240313164223.615640-49-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313164223.615640-1-sashal@kernel.org> References: <20240313164223.615640-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.152-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.15.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.15.152-rc1 X-KernelTest-Deadline: 2024-03-15T16:42+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Cosmin Tanislav [ Upstream commit 285e76fc049c4d32c772eea9460a7ef28a193802 ] The SPI batch read/write operations can be implemented as simple regmap raw read and write, which will also try to do a gather write just as it is done here. Use the regmap raw read and write methods. Reviewed-by: Andy Shevchenko Signed-off-by: Cosmin Tanislav Link: https://lore.kernel.org/r/20220605144659.4169853-2-demonsingur@gmail.= com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: b35f8dbbce81 ("serial: max310x: prevent infinite while() loo= p in port startup") Signed-off-by: Sasha Levin --- drivers/tty/serial/max310x.c | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 5dd73d1da1ecc..c9032e300a586 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -263,8 +263,6 @@ struct max310x_one { struct work_struct md_work; struct work_struct rs_work; =20 - u8 wr_header; - u8 rd_header; u8 rx_buf[MAX310X_FIFO_SIZE]; }; #define to_max310x_port(_port) \ @@ -635,32 +633,18 @@ static s32 max310x_set_ref_clk(struct device *dev, st= ruct max310x_port *s, =20 static void max310x_batch_write(struct uart_port *port, u8 *txbuf, unsigne= d int len) { - struct max310x_one *one =3D to_max310x_port(port); - struct spi_transfer xfer[] =3D { - { - .tx_buf =3D &one->wr_header, - .len =3D sizeof(one->wr_header), - }, { - .tx_buf =3D txbuf, - .len =3D len, - } - }; - spi_sync_transfer(to_spi_device(port->dev), xfer, ARRAY_SIZE(xfer)); + struct max310x_port *s =3D dev_get_drvdata(port->dev); + u8 reg =3D port->iobase + MAX310X_THR_REG; + + regmap_raw_write(s->regmap, reg, txbuf, len); } =20 static void max310x_batch_read(struct uart_port *port, u8 *rxbuf, unsigned= int len) { - struct max310x_one *one =3D to_max310x_port(port); - struct spi_transfer xfer[] =3D { - { - .tx_buf =3D &one->rd_header, - .len =3D sizeof(one->rd_header), - }, { - .rx_buf =3D rxbuf, - .len =3D len, - } - }; - spi_sync_transfer(to_spi_device(port->dev), xfer, ARRAY_SIZE(xfer)); + struct max310x_port *s =3D dev_get_drvdata(port->dev); + u8 reg =3D port->iobase + MAX310X_RHR_REG; + + regmap_raw_read(s->regmap, reg, rxbuf, len); } =20 static void max310x_handle_rx(struct uart_port *port, unsigned int rxlen) @@ -1386,10 +1370,6 @@ static int max310x_probe(struct device *dev, const s= truct max310x_devtype *devty INIT_WORK(&s->p[i].md_work, max310x_md_proc); /* Initialize queue for changing RS485 mode */ INIT_WORK(&s->p[i].rs_work, max310x_rs_proc); - /* Initialize SPI-transfer buffers */ - s->p[i].wr_header =3D (s->p[i].port.iobase + MAX310X_THR_REG) | - MAX310X_WRITE_BIT; - s->p[i].rd_header =3D (s->p[i].port.iobase + MAX310X_RHR_REG); =20 /* Register port */ ret =3D uart_add_one_port(&max310x_uart, &s->p[i].port); --=20 2.43.0