| Message ID | 20210105140305.141401-6-tsbogend@alpha.franken.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Remove support for TX49xx | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 05-01-21, 15:02, Thomas Bogendoerfer wrote:
> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Applied after fixing subsystem name, thanks
On Tue, 2021-01-05 at 15:02 +0100, Thomas Bogendoerfer wrote: > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> [] > diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h [] > @@ -26,11 +26,6 @@ > * DMA channel. > */ > > > -#ifdef CONFIG_MACH_TX49XX > -static inline bool txx9_dma_have_SMPCHN(void) > -{ > - return true; > -} > #define TXX9_DMA_USE_SIMPLE_CHAIN > #else > static inline bool txx9_dma_have_SMPCHN(void) This doesn't look like it compiles as there's now an #else without an #if
On Wed, Jan 06, 2021 at 11:10:38AM -0800, Joe Perches wrote: > On Tue, 2021-01-05 at 15:02 +0100, Thomas Bogendoerfer wrote: > > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > [] > > diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h > [] > > @@ -26,11 +26,6 @@ > > * DMA channel. > > */ > > > > > > -#ifdef CONFIG_MACH_TX49XX > > -static inline bool txx9_dma_have_SMPCHN(void) > > -{ > > - return true; > > -} > > #define TXX9_DMA_USE_SIMPLE_CHAIN > > #else > > static inline bool txx9_dma_have_SMPCHN(void) > > This doesn't look like it compiles as there's now an #else > without an #if you are right, no idea what I had in mind while doing that. Vinod, as this patch series found a still active user of the platform, could you drop the patch from your tree, or do you want a revert from me ? Thomas.
On 07-01-21, 17:40, Thomas Bogendoerfer wrote: > On Wed, Jan 06, 2021 at 11:10:38AM -0800, Joe Perches wrote: > > On Tue, 2021-01-05 at 15:02 +0100, Thomas Bogendoerfer wrote: > > > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > [] > > > diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h > > [] > > > @@ -26,11 +26,6 @@ > > > * DMA channel. > > > */ > > > > > > > > > -#ifdef CONFIG_MACH_TX49XX > > > -static inline bool txx9_dma_have_SMPCHN(void) > > > -{ > > > - return true; > > > -} > > > #define TXX9_DMA_USE_SIMPLE_CHAIN > > > #else > > > static inline bool txx9_dma_have_SMPCHN(void) > > > > This doesn't look like it compiles as there's now an #else > > without an #if > > you are right, no idea what I had in mind while doing that. > > Vinod, > > as this patch series found a still active user of the platform, > could you drop the patch from your tree, or do you want a revert > from me ? Dropped now
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index d242c7632621..22fedfb6f5f9 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -601,7 +601,7 @@ config S3C24XX_DMAC config TXX9_DMAC tristate "Toshiba TXx9 SoC DMA support" - depends on MACH_TX49XX || MACH_TX39XX + depends on MACH_TX39XX select DMA_ENGINE help Support the TXx9 SoC internal DMA controller. This can be diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h index aa53eafb1519..4acf29f50a29 100644 --- a/drivers/dma/txx9dmac.h +++ b/drivers/dma/txx9dmac.h @@ -26,11 +26,6 @@ * DMA channel. */ -#ifdef CONFIG_MACH_TX49XX -static inline bool txx9_dma_have_SMPCHN(void) -{ - return true; -} #define TXX9_DMA_USE_SIMPLE_CHAIN #else static inline bool txx9_dma_have_SMPCHN(void) @@ -40,13 +35,8 @@ static inline bool txx9_dma_have_SMPCHN(void) #endif #ifdef __LITTLE_ENDIAN -#ifdef CONFIG_MACH_TX49XX -#define CCR_LE TXX9_DMA_CCR_LE -#define MCR_LE 0 -#else #define CCR_LE 0 #define MCR_LE TXX9_DMA_MCR_LE -#endif #else #define CCR_LE 0 #define MCR_LE 0
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- drivers/dma/Kconfig | 2 +- drivers/dma/txx9dmac.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-)