Message ID | 20180321085819.23249-1-madalin.bucur@nxp.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Series | fsl/fman: remove unnecessary set_dma_ops() call and HAS_DMA dependency | expand |
From: Madalin Bucur <madalin.bucur@nxp.com> Date: Wed, 21 Mar 2018 03:58:19 -0500 > The platform device is no longer used for DMA mapping so the > (questionable) setting of the DMA ops done here is no longer > needed. Removing it together with the HAS_DMA dependency that > it required. > > Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com> This doesn't apply to any of my trees.
> -----Original Message----- > From: David Miller [mailto:davem@davemloft.net] > Sent: Thursday, March 22, 2018 8:32 PM > To: Madalin-cristian Bucur <madalin.bucur@nxp.com> > Cc: geert.uytterhoeven@gmail.com; netdev@vger.kernel.org; linux- > kernel@vger.kernel.org > Subject: Re: [PATCH] fsl/fman: remove unnecessary set_dma_ops() call and > HAS_DMA dependency > > From: Madalin Bucur <madalin.bucur@nxp.com> > Date: Wed, 21 Mar 2018 03:58:19 -0500 > > > The platform device is no longer used for DMA mapping so the > > (questionable) setting of the DMA ops done here is no longer > > needed. Removing it together with the HAS_DMA dependency that > > it required. > > > > Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com> > > This doesn't apply to any of my trees. Sorry, it's caused by a patch in my tree that adds ARM 32b support, resulting in differences in the context: - depends on FSL_SOC || ARCH_LAYERSCAPE || COMPILE_TEST + depends on ARM || ARCH_LAYERSCAPE || FSL_SOC || COMPILE_TEST I'll send a v2 based on a clean tree. Madalin
diff --git a/drivers/net/ethernet/freescale/fman/Kconfig b/drivers/net/ethernet/freescale/fman/Kconfig index 7918cd6..c24deb4 100644 --- a/drivers/net/ethernet/freescale/fman/Kconfig +++ b/drivers/net/ethernet/freescale/fman/Kconfig @@ -2,7 +2,6 @@ config FSL_FMAN tristate "FMan support" depends on ARM || ARCH_LAYERSCAPE || FSL_SOC || COMPILE_TEST select GENERIC_ALLOCATOR - depends on HAS_DMA select PHYLIB default n help diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 4829dcd..7b5b95f 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -567,7 +567,6 @@ static struct platform_device *dpaa_eth_add_device(int fman_id, } pdev->dev.parent = priv->dev; - set_dma_ops(&pdev->dev, get_dma_ops(priv->dev)); ret = platform_device_add_data(pdev, &data, sizeof(data)); if (ret)
The platform device is no longer used for DMA mapping so the (questionable) setting of the DMA ops done here is no longer needed. Removing it together with the HAS_DMA dependency that it required. Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com> --- drivers/net/ethernet/freescale/fman/Kconfig | 1 - drivers/net/ethernet/freescale/fman/mac.c | 1 - 2 files changed, 2 deletions(-)