This patchset removes un-necessary endianness swapping functions.
This was detected by sparse, after the commit f68a7dcb91b7
("spi: a3700: Add full-duplex support") introduced a new warning.
This series fix this warning, plus some previously existing ones of
the same nature.
I split this into two patches, since the first applies on an already
mainlined commit, and the other on a recent patch that I sent.
Mark, if you wish I can resend this in another form (just one patch,
or as a rework of my previous patchset
"spi: a3700: Add improvements and full-duplex transfers").
Maxime Chevallier (2):
spi: a3700: Remove endianness swapping functions when accessing FIFOs
spi: a3700: Remove endianness swapping for full-duplex transfers
drivers/spi/spi-armada-3700.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
--
2.1.4
Fixes the following sparse warnings :
line 767: warning: incorrect type in assignment (different base types)
line 767: expected unsigned int [unsigned] [assigned] [usertype] val_out
line 767: got restricted __le32 [usertype] <noident>
line 776: warning: cast to restricted __le32
This takes advantage of readl/writel to do the endianness reordering,
and removes an extra variable in the function.
Fixes: f68a7dcb91b7 ("spi: a3700: Add full-duplex support")
Signed-off-by: Maxime Chevallier <[email protected]>
---
drivers/spi/spi-armada-3700.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
index 43ee0b56fe1c..7dcb14d303eb 100644
--- a/drivers/spi/spi-armada-3700.c
+++ b/drivers/spi/spi-armada-3700.c
@@ -747,7 +747,7 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
struct spi_transfer *xfer)
{
struct a3700_spi *a3700_spi = spi_master_get_devdata(master);
- u32 val_in, val_out;
+ u32 val;
/* Disable FIFO mode */
a3700_spi_fifo_mode_set(a3700_spi, false);
@@ -761,21 +761,20 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
a3700_spi_bytelen_set(a3700_spi, 1);
if (a3700_spi->byte_len == 1)
- val_out = *a3700_spi->tx_buf;
+ val = *a3700_spi->tx_buf;
else
- val_out = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
+ val = *(u32 *)a3700_spi->tx_buf;
- spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val_out);
+ spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
/* Wait for all the data to be shifted in / out */
while (!(spireg_read(a3700_spi, A3700_SPI_IF_CTRL_REG) &
A3700_SPI_XFER_DONE))
cpu_relax();
- val_in = le32_to_cpu(spireg_read(a3700_spi,
- A3700_SPI_DATA_IN_REG));
+ val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
- memcpy(a3700_spi->rx_buf, &val_in, a3700_spi->byte_len);
+ memcpy(a3700_spi->rx_buf, &val, a3700_spi->byte_len);
a3700_spi->buf_len -= a3700_spi->byte_len;
a3700_spi->tx_buf += a3700_spi->byte_len;
--
2.1.4
Fixes the following sparse warnings :
line 504: warning: incorrect type in assignment (different base types)
line 504: expected unsigned int [unsigned] [usertype] val
line 504: got restricted __le32 [usertype] <noident>
line 527: warning: cast to restricted __le32
This is solved by removing endian-converson functions, since the
converted values are going through readl/writel anyway, which take care
of the conversion.
Fixes: 6fd6fd68c9e2 ("spi: armada-3700: Fix padding when sending not 4-byte aligned data")
Signed-off-by: Maxime Chevallier <[email protected]>
---
drivers/spi/spi-armada-3700.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
index a8576c89f713..43ee0b56fe1c 100644
--- a/drivers/spi/spi-armada-3700.c
+++ b/drivers/spi/spi-armada-3700.c
@@ -501,7 +501,7 @@ static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi)
u32 val;
while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) {
- val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
+ val = *(u32 *)a3700_spi->tx_buf;
spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
a3700_spi->buf_len -= 4;
a3700_spi->tx_buf += 4;
@@ -524,9 +524,8 @@ static int a3700_spi_fifo_read(struct a3700_spi *a3700_spi)
while (!a3700_is_rfifo_empty(a3700_spi) && a3700_spi->buf_len) {
val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
if (a3700_spi->buf_len >= 4) {
- u32 data = le32_to_cpu(val);
- memcpy(a3700_spi->rx_buf, &data, 4);
+ memcpy(a3700_spi->rx_buf, &val, 4);
a3700_spi->buf_len -= 4;
a3700_spi->rx_buf += 4;
--
2.1.4
Hi Maxime,
On mer., janv. 24 2018, Maxime Chevallier <[email protected]> wrote:
> Fixes the following sparse warnings :
> line 504: warning: incorrect type in assignment (different base types)
> line 504: expected unsigned int [unsigned] [usertype] val
> line 504: got restricted __le32 [usertype] <noident>
> line 527: warning: cast to restricted __le32
>
> This is solved by removing endian-converson functions, since the
> converted values are going through readl/writel anyway, which take care
> of the conversion.
>
These changes look good for me:
Reviewed-by: Gregory CLEMENT <[email protected]>
Thanks,
Gregory
> Fixes: 6fd6fd68c9e2 ("spi: armada-3700: Fix padding when sending not 4-byte aligned data")
> Signed-off-by: Maxime Chevallier <[email protected]>
> ---
> drivers/spi/spi-armada-3700.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
> index a8576c89f713..43ee0b56fe1c 100644
> --- a/drivers/spi/spi-armada-3700.c
> +++ b/drivers/spi/spi-armada-3700.c
> @@ -501,7 +501,7 @@ static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi)
> u32 val;
>
> while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) {
> - val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
> + val = *(u32 *)a3700_spi->tx_buf;
> spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
> a3700_spi->buf_len -= 4;
> a3700_spi->tx_buf += 4;
> @@ -524,9 +524,8 @@ static int a3700_spi_fifo_read(struct a3700_spi *a3700_spi)
> while (!a3700_is_rfifo_empty(a3700_spi) && a3700_spi->buf_len) {
> val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
> if (a3700_spi->buf_len >= 4) {
> - u32 data = le32_to_cpu(val);
>
> - memcpy(a3700_spi->rx_buf, &data, 4);
> + memcpy(a3700_spi->rx_buf, &val, 4);
>
> a3700_spi->buf_len -= 4;
> a3700_spi->rx_buf += 4;
> --
> 2.1.4
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Hi Maxime,
On mer., janv. 24 2018, Maxime Chevallier <[email protected]> wrote:
> Fixes the following sparse warnings :
> line 767: warning: incorrect type in assignment (different base types)
> line 767: expected unsigned int [unsigned] [assigned] [usertype] val_out
> line 767: got restricted __le32 [usertype] <noident>
> line 776: warning: cast to restricted __le32
>
> This takes advantage of readl/writel to do the endianness reordering,
> and removes an extra variable in the function.
>
> Fixes: f68a7dcb91b7 ("spi: a3700: Add full-duplex support")
> Signed-off-by: Maxime Chevallier <[email protected]>
As for the previous patch:
Reviewed-by: Gregory CLEMENT <[email protected]>
Thanks,
Gregory> ---
> drivers/spi/spi-armada-3700.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
> index 43ee0b56fe1c..7dcb14d303eb 100644
> --- a/drivers/spi/spi-armada-3700.c
> +++ b/drivers/spi/spi-armada-3700.c
> @@ -747,7 +747,7 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
> struct spi_transfer *xfer)
> {
> struct a3700_spi *a3700_spi = spi_master_get_devdata(master);
> - u32 val_in, val_out;
> + u32 val;
>
> /* Disable FIFO mode */
> a3700_spi_fifo_mode_set(a3700_spi, false);
> @@ -761,21 +761,20 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
> a3700_spi_bytelen_set(a3700_spi, 1);
>
> if (a3700_spi->byte_len == 1)
> - val_out = *a3700_spi->tx_buf;
> + val = *a3700_spi->tx_buf;
> else
> - val_out = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
> + val = *(u32 *)a3700_spi->tx_buf;
>
> - spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val_out);
> + spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
>
> /* Wait for all the data to be shifted in / out */
> while (!(spireg_read(a3700_spi, A3700_SPI_IF_CTRL_REG) &
> A3700_SPI_XFER_DONE))
> cpu_relax();
>
> - val_in = le32_to_cpu(spireg_read(a3700_spi,
> - A3700_SPI_DATA_IN_REG));
> + val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
>
> - memcpy(a3700_spi->rx_buf, &val_in, a3700_spi->byte_len);
> + memcpy(a3700_spi->rx_buf, &val, a3700_spi->byte_len);
>
> a3700_spi->buf_len -= a3700_spi->byte_len;
> a3700_spi->tx_buf += a3700_spi->byte_len;
> --
> 2.1.4
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
The patch
spi: a3700: Remove endianness swapping for full-duplex transfers
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 34b1fcaeb21de2a64004a95a1dc52d7e9998b733 Mon Sep 17 00:00:00 2001
From: Maxime Chevallier <[email protected]>
Date: Wed, 24 Jan 2018 15:10:48 +0100
Subject: [PATCH] spi: a3700: Remove endianness swapping for full-duplex
transfers
Fixes the following sparse warnings :
line 767: warning: incorrect type in assignment (different base types)
line 767: expected unsigned int [unsigned] [assigned] [usertype] val_out
line 767: got restricted __le32 [usertype] <noident>
line 776: warning: cast to restricted __le32
This takes advantage of readl/writel to do the endianness reordering,
and removes an extra variable in the function.
Fixes: f68a7dcb91b7 ("spi: a3700: Add full-duplex support")
Signed-off-by: Maxime Chevallier <[email protected]>
Reviewed-by: Gregory CLEMENT <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/spi/spi-armada-3700.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
index f32b83c7209f..1f42bd04e630 100644
--- a/drivers/spi/spi-armada-3700.c
+++ b/drivers/spi/spi-armada-3700.c
@@ -739,7 +739,7 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
struct spi_transfer *xfer)
{
struct a3700_spi *a3700_spi = spi_master_get_devdata(master);
- u32 val_in, val_out;
+ u32 val;
/* Disable FIFO mode */
a3700_spi_fifo_mode_set(a3700_spi, false);
@@ -753,21 +753,20 @@ static int a3700_spi_transfer_one_full_duplex(struct spi_master *master,
a3700_spi_bytelen_set(a3700_spi, 1);
if (a3700_spi->byte_len == 1)
- val_out = *a3700_spi->tx_buf;
+ val = *a3700_spi->tx_buf;
else
- val_out = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
+ val = *(u32 *)a3700_spi->tx_buf;
- spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val_out);
+ spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
/* Wait for all the data to be shifted in / out */
while (!(spireg_read(a3700_spi, A3700_SPI_IF_CTRL_REG) &
A3700_SPI_XFER_DONE))
cpu_relax();
- val_in = le32_to_cpu(spireg_read(a3700_spi,
- A3700_SPI_DATA_IN_REG));
+ val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
- memcpy(a3700_spi->rx_buf, &val_in, a3700_spi->byte_len);
+ memcpy(a3700_spi->rx_buf, &val, a3700_spi->byte_len);
a3700_spi->buf_len -= a3700_spi->byte_len;
a3700_spi->tx_buf += a3700_spi->byte_len;
--
2.15.1
The patch
spi: a3700: Remove endianness swapping functions when accessing FIFOs
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 162f8debc01f48ac984ed6d7291743053ec90271 Mon Sep 17 00:00:00 2001
From: Maxime Chevallier <[email protected]>
Date: Wed, 24 Jan 2018 15:10:47 +0100
Subject: [PATCH] spi: a3700: Remove endianness swapping functions when
accessing FIFOs
Fixes the following sparse warnings :
line 504: warning: incorrect type in assignment (different base types)
line 504: expected unsigned int [unsigned] [usertype] val
line 504: got restricted __le32 [usertype] <noident>
line 527: warning: cast to restricted __le32
This is solved by removing endian-converson functions, since the
converted values are going through readl/writel anyway, which take care
of the conversion.
Fixes: 6fd6fd68c9e2 ("spi: armada-3700: Fix padding when sending not 4-byte aligned data")
Signed-off-by: Maxime Chevallier <[email protected]>
Reviewed-by: Gregory CLEMENT <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/spi/spi-armada-3700.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c
index fdc35dabcda2..f32b83c7209f 100644
--- a/drivers/spi/spi-armada-3700.c
+++ b/drivers/spi/spi-armada-3700.c
@@ -493,7 +493,7 @@ static int a3700_spi_fifo_write(struct a3700_spi *a3700_spi)
u32 val;
while (!a3700_is_wfifo_full(a3700_spi) && a3700_spi->buf_len) {
- val = cpu_to_le32(*(u32 *)a3700_spi->tx_buf);
+ val = *(u32 *)a3700_spi->tx_buf;
spireg_write(a3700_spi, A3700_SPI_DATA_OUT_REG, val);
a3700_spi->buf_len -= 4;
a3700_spi->tx_buf += 4;
@@ -516,9 +516,8 @@ static int a3700_spi_fifo_read(struct a3700_spi *a3700_spi)
while (!a3700_is_rfifo_empty(a3700_spi) && a3700_spi->buf_len) {
val = spireg_read(a3700_spi, A3700_SPI_DATA_IN_REG);
if (a3700_spi->buf_len >= 4) {
- u32 data = le32_to_cpu(val);
- memcpy(a3700_spi->rx_buf, &data, 4);
+ memcpy(a3700_spi->rx_buf, &val, 4);
a3700_spi->buf_len -= 4;
a3700_spi->rx_buf += 4;
--
2.15.1