ARM: SAMSUNG: dma: Remove unnecessary code
Subsystems (3)
PATCH RESEND 1/1 ARM: SAMSUNG: dma: Remove unnecessary code
This patch removes the usage of DMACH_DT_PROP and dt_dmach_prop from dma code as the new generic dma dt binding support has been added.
Signed-off-by Padmavathi Venna <[email protected]>
Acked-by Arnd Bergmann <[email protected]>
--- arch/arm/mach-s3c24xx/include/mach/dma.h | 1 - arch/arm/mach-s3c64xx/include/mach/dma.h | 1 - arch/arm/plat-samsung/dma-ops.c | 10 +--------- arch/arm/plat-samsung/include/plat/dma-ops.h | 1 - arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 - 5 files changed, 1 insertions(+), 13 deletions(-)
arch/arm/mach-s3c24xx/include/mach/dma.h +0 -1
@@ -24,7 +24,6 @@*/ enum dma_ch { -DMACH_DT_PROP =-1 ,/* not yet supported, do not use */ DMACH_XD0 =0 ,DMACH_XD1 ,DMACH_SDI ,
arch/arm/mach-s3c64xx/include/mach/dma.h +0 -1
@@ -21,7 +21,6 @@*/ enum dma_ch {/* DMA0/SDMA0 */ -DMACH_DT_PROP =-1 ,/* not yet supported, do not use */ DMACH_UART0 =0 ,DMACH_UART0_SRC2 ,DMACH_UART1 ,
arch/arm/plat-samsung/dma-ops.c +1 -9
@@ -23,23 +23,15 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch, struct device *dev, char *ch_name) { dma_cap_mask_t mask; -void *filter_param;dma_cap_zero (mask);dma_cap_set (param->cap, mask); -/* -* If a dma channel property of a device node from device tree is -* specified, use that as the fliter parameter. -*/ - filter_param = (dma_ch ==DMACH_DT_PROP ) ? - (void *)param->dt_dmach_prop : (void *)dma_ch; -if (dev->of_node)return (unsigned )dma_request_slave_channel (dev, ch_name);else return (unsigned )dma_request_channel (mask, pl330_filter, - filter_param); + (void *)dma_ch); }static int samsung_dmadev_release (unsigned ch,void *param)
arch/arm/plat-samsung/include/plat/dma-ops.h +0 -1
@@ -18,7 +18,6 @@struct samsung_dma_req {enum dma_transaction_type cap; -struct property *dt_dmach_prop;struct s3c2410_dma_client *client; };
arch/arm/plat-samsung/include/plat/dma-pl330.h +0 -1
@@ -21,7 +21,6 @@* use these just as IDs. */ enum dma_ch { -DMACH_DT_PROP =-1 ,DMACH_UART0_RX =0 ,DMACH_UART0_TX ,DMACH_UART1_RX ,
Signature · 1 line
1.7.4.4
PATCH RESEND 1/1 ARM: SAMSUNG: dma: Remove unnecessary code
Quoted 6 lines · Padmavathi Venna
This patch removes the usage of
DMACH_DT_PROPanddt_dmach_propfrom dma code as the new generic dma dt binding support has been added.Signed-off-by Padmavathi Venna<[email protected]>Acked-by Arnd Bergmann<[email protected]>
Quoted 8 lines
--- arch/arm/mach-s3c24xx/include/mach/dma.h | 1 - arch/arm/mach-s3c64xx/include/mach/dma.h | 1 - arch/arm/plat-samsung/dma-ops.c | 10 +--------- arch/arm/plat-samsung/include/plat/dma-ops.h | 1 - arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 - 5 files changed, 1 insertions(+), 13 deletions(-)
OK, applied.
Thanks.
- Kukjin