[PATCH 2/2] Revert "m68k: set dma and coherent masks for platform FEC ethernets"

2018-05-17 Thread Finn Thain
This reverts commit f61e64310b75733d782e930d1fb404b84699eed6.

Initializing the coherent dma mask for a m68k platform device
with DMA_BIT_MASK(32) is no longer necessary because
arch_setup_pdev_archdata() now does so by default.

Cc: Christoph Hellwig 
Cc: Greg Ungerer 
Signed-off-by: Finn Thain 
---
 arch/m68k/coldfire/device.c | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
index 908d58347790..84938fdbbada 100644
--- a/arch/m68k/coldfire/device.c
+++ b/arch/m68k/coldfire/device.c
@@ -135,11 +135,7 @@ static struct platform_device mcf_fec0 = {
.id = 0,
.num_resources  = ARRAY_SIZE(mcf_fec0_resources),
.resource   = mcf_fec0_resources,
-   .dev = {
-   .dma_mask   = _fec0.dev.coherent_dma_mask,
-   .coherent_dma_mask  = DMA_BIT_MASK(32),
-   .platform_data  = FEC_PDATA,
-   }
+   .dev.platform_data  = FEC_PDATA,
 };
 
 #ifdef MCFFEC_BASE1
@@ -171,11 +167,7 @@ static struct platform_device mcf_fec1 = {
.id = 1,
.num_resources  = ARRAY_SIZE(mcf_fec1_resources),
.resource   = mcf_fec1_resources,
-   .dev = {
-   .dma_mask   = _fec1.dev.coherent_dma_mask,
-   .coherent_dma_mask  = DMA_BIT_MASK(32),
-   .platform_data  = FEC_PDATA,
-   }
+   .dev.platform_data  = FEC_PDATA,
 };
 #endif /* MCFFEC_BASE1 */
 #endif /* CONFIG_FEC */
-- 
2.16.1



[PATCH 2/2] Revert "m68k: set dma and coherent masks for platform FEC ethernets"

2018-05-17 Thread Finn Thain
This reverts commit f61e64310b75733d782e930d1fb404b84699eed6.

Initializing the coherent dma mask for a m68k platform device
with DMA_BIT_MASK(32) is no longer necessary because
arch_setup_pdev_archdata() now does so by default.

Cc: Christoph Hellwig 
Cc: Greg Ungerer 
Signed-off-by: Finn Thain 
---
 arch/m68k/coldfire/device.c | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
index 908d58347790..84938fdbbada 100644
--- a/arch/m68k/coldfire/device.c
+++ b/arch/m68k/coldfire/device.c
@@ -135,11 +135,7 @@ static struct platform_device mcf_fec0 = {
.id = 0,
.num_resources  = ARRAY_SIZE(mcf_fec0_resources),
.resource   = mcf_fec0_resources,
-   .dev = {
-   .dma_mask   = _fec0.dev.coherent_dma_mask,
-   .coherent_dma_mask  = DMA_BIT_MASK(32),
-   .platform_data  = FEC_PDATA,
-   }
+   .dev.platform_data  = FEC_PDATA,
 };
 
 #ifdef MCFFEC_BASE1
@@ -171,11 +167,7 @@ static struct platform_device mcf_fec1 = {
.id = 1,
.num_resources  = ARRAY_SIZE(mcf_fec1_resources),
.resource   = mcf_fec1_resources,
-   .dev = {
-   .dma_mask   = _fec1.dev.coherent_dma_mask,
-   .coherent_dma_mask  = DMA_BIT_MASK(32),
-   .platform_data  = FEC_PDATA,
-   }
+   .dev.platform_data  = FEC_PDATA,
 };
 #endif /* MCFFEC_BASE1 */
 #endif /* CONFIG_FEC */
-- 
2.16.1