* [PATCH] spi: atmel: Remove AVR32 leftover
@ 2019-09-19 15:40 Gregory CLEMENT
2019-09-19 17:24 ` Alexandre Belloni
2019-10-01 11:41 ` Applied "spi: atmel: Remove AVR32 leftover" to the spi tree Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Gregory CLEMENT @ 2019-09-19 15:40 UTC (permalink / raw)
To: Mark Brown, linux-spi, linux-kernel, Nicolas Ferre
Cc: Thomas Petazzoni, Alexandre Belloni, Ludovic Desroches,
linux-arm-kernel, Gregory CLEMENT
AV32 support has been from the kernel a few release ago, but there was
still some specific macro for this architecture in this driver. Lets
remove it.
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
drivers/spi/spi-atmel.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index bb94f5927819..de1e1861a70c 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -222,37 +222,13 @@
| SPI_BF(name, value))
/* Register access macros */
-#ifdef CONFIG_AVR32
-#define spi_readl(port, reg) \
- __raw_readl((port)->regs + SPI_##reg)
-#define spi_writel(port, reg, value) \
- __raw_writel((value), (port)->regs + SPI_##reg)
-
-#define spi_readw(port, reg) \
- __raw_readw((port)->regs + SPI_##reg)
-#define spi_writew(port, reg, value) \
- __raw_writew((value), (port)->regs + SPI_##reg)
-
-#define spi_readb(port, reg) \
- __raw_readb((port)->regs + SPI_##reg)
-#define spi_writeb(port, reg, value) \
- __raw_writeb((value), (port)->regs + SPI_##reg)
-#else
#define spi_readl(port, reg) \
readl_relaxed((port)->regs + SPI_##reg)
#define spi_writel(port, reg, value) \
writel_relaxed((value), (port)->regs + SPI_##reg)
-
-#define spi_readw(port, reg) \
- readw_relaxed((port)->regs + SPI_##reg)
#define spi_writew(port, reg, value) \
writew_relaxed((value), (port)->regs + SPI_##reg)
-#define spi_readb(port, reg) \
- readb_relaxed((port)->regs + SPI_##reg)
-#define spi_writeb(port, reg, value) \
- writeb_relaxed((value), (port)->regs + SPI_##reg)
-#endif
/* use PIO for small transfers, avoiding DMA setup/teardown overhead and
* cache operations; better heuristics consider wordsize and bitrate.
*/
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] spi: atmel: Remove AVR32 leftover
2019-09-19 15:40 [PATCH] spi: atmel: Remove AVR32 leftover Gregory CLEMENT
@ 2019-09-19 17:24 ` Alexandre Belloni
2019-09-19 19:13 ` Thomas Petazzoni
2019-10-01 11:41 ` Applied "spi: atmel: Remove AVR32 leftover" to the spi tree Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Alexandre Belloni @ 2019-09-19 17:24 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: linux-kernel, Ludovic Desroches, Mark Brown, Thomas Petazzoni,
linux-spi, linux-arm-kernel
On 19/09/2019 17:40:34+0200, Gregory CLEMENT wrote:
> AV32 support has been from the kernel a few release ago, but there was
AVR32 and missing word^
> still some specific macro for this architecture in this driver. Lets
> remove it.
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
> ---
> drivers/spi/spi-atmel.c | 24 ------------------------
> 1 file changed, 24 deletions(-)
>
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index bb94f5927819..de1e1861a70c 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -222,37 +222,13 @@
> | SPI_BF(name, value))
>
> /* Register access macros */
> -#ifdef CONFIG_AVR32
> -#define spi_readl(port, reg) \
> - __raw_readl((port)->regs + SPI_##reg)
> -#define spi_writel(port, reg, value) \
> - __raw_writel((value), (port)->regs + SPI_##reg)
> -
> -#define spi_readw(port, reg) \
> - __raw_readw((port)->regs + SPI_##reg)
> -#define spi_writew(port, reg, value) \
> - __raw_writew((value), (port)->regs + SPI_##reg)
> -
> -#define spi_readb(port, reg) \
> - __raw_readb((port)->regs + SPI_##reg)
> -#define spi_writeb(port, reg, value) \
> - __raw_writeb((value), (port)->regs + SPI_##reg)
> -#else
> #define spi_readl(port, reg) \
> readl_relaxed((port)->regs + SPI_##reg)
> #define spi_writel(port, reg, value) \
> writel_relaxed((value), (port)->regs + SPI_##reg)
> -
> -#define spi_readw(port, reg) \
> - readw_relaxed((port)->regs + SPI_##reg)
> #define spi_writew(port, reg, value) \
> writew_relaxed((value), (port)->regs + SPI_##reg)
>
> -#define spi_readb(port, reg) \
> - readb_relaxed((port)->regs + SPI_##reg)
> -#define spi_writeb(port, reg, value) \
> - writeb_relaxed((value), (port)->regs + SPI_##reg)
> -#endif
> /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
> * cache operations; better heuristics consider wordsize and bitrate.
> */
> --
> 2.23.0
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] spi: atmel: Remove AVR32 leftover
2019-09-19 17:24 ` Alexandre Belloni
@ 2019-09-19 19:13 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-09-19 19:13 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Gregory CLEMENT, linux-kernel, Ludovic Desroches, Mark Brown,
linux-spi, linux-arm-kernel
On Thu, 19 Sep 2019 19:24:53 +0200
Alexandre Belloni <alexandre.belloni@bootlin.com> wrote:
> On 19/09/2019 17:40:34+0200, Gregory CLEMENT wrote:
> > AV32 support has been from the kernel a few release ago, but there was
> AVR32 and missing word^
>
> > still some specific macro for this architecture in this driver. Lets
> > remove it.
If you want to actually be pedantic, there are a few other typos in the
commit. Hopefully the below text has all of them fixed (and does not
introduce any new one):
==
AVR32 support has been removed from the kernel a few releases ago, but
there were still some specific macros for this architecture in this
driver. Let's remove them.
==
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Applied "spi: atmel: Remove AVR32 leftover" to the spi tree
2019-09-19 15:40 [PATCH] spi: atmel: Remove AVR32 leftover Gregory CLEMENT
2019-09-19 17:24 ` Alexandre Belloni
@ 2019-10-01 11:41 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2019-10-01 11:41 UTC (permalink / raw)
To: Gregory CLEMENT
Cc: Alexandre Belloni, linux-kernel, linux-spi, Ludovic Desroches,
Mark Brown, Thomas Petazzoni, linux-arm-kernel
The patch
spi: atmel: Remove AVR32 leftover
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
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 e61bb114d41ddf6ae5bf05a0109fc13116550c7d Mon Sep 17 00:00:00 2001
From: Gregory CLEMENT <gregory.clement@bootlin.com>
Date: Thu, 19 Sep 2019 17:40:34 +0200
Subject: [PATCH] spi: atmel: Remove AVR32 leftover
AV32 support has been from the kernel a few release ago, but there was
still some specific macro for this architecture in this driver. Lets
remove it.
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Link: https://lore.kernel.org/r/20190919154034.7489-1-gregory.clement@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/spi/spi-atmel.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index acf318e7330c..3ed5e663da6f 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -222,37 +222,13 @@
| SPI_BF(name, value))
/* Register access macros */
-#ifdef CONFIG_AVR32
-#define spi_readl(port, reg) \
- __raw_readl((port)->regs + SPI_##reg)
-#define spi_writel(port, reg, value) \
- __raw_writel((value), (port)->regs + SPI_##reg)
-
-#define spi_readw(port, reg) \
- __raw_readw((port)->regs + SPI_##reg)
-#define spi_writew(port, reg, value) \
- __raw_writew((value), (port)->regs + SPI_##reg)
-
-#define spi_readb(port, reg) \
- __raw_readb((port)->regs + SPI_##reg)
-#define spi_writeb(port, reg, value) \
- __raw_writeb((value), (port)->regs + SPI_##reg)
-#else
#define spi_readl(port, reg) \
readl_relaxed((port)->regs + SPI_##reg)
#define spi_writel(port, reg, value) \
writel_relaxed((value), (port)->regs + SPI_##reg)
-
-#define spi_readw(port, reg) \
- readw_relaxed((port)->regs + SPI_##reg)
#define spi_writew(port, reg, value) \
writew_relaxed((value), (port)->regs + SPI_##reg)
-#define spi_readb(port, reg) \
- readb_relaxed((port)->regs + SPI_##reg)
-#define spi_writeb(port, reg, value) \
- writeb_relaxed((value), (port)->regs + SPI_##reg)
-#endif
/* use PIO for small transfers, avoiding DMA setup/teardown overhead and
* cache operations; better heuristics consider wordsize and bitrate.
*/
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-01 11:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-19 15:40 [PATCH] spi: atmel: Remove AVR32 leftover Gregory CLEMENT
2019-09-19 17:24 ` Alexandre Belloni
2019-09-19 19:13 ` Thomas Petazzoni
2019-10-01 11:41 ` Applied "spi: atmel: Remove AVR32 leftover" to the spi tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).