diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-20 13:46:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-20 13:46:54 -0400 |
| commit | 73b098d6fa175e4ecd98e6c1fe53c77ebf6b3eaa (patch) | |
| tree | 14b8c9af4c4d08a0766a361d568ef541deb59834 | |
| parent | fe420d87bbc234015b4195dd239b7d3052b140ea (diff) | |
| parent | fb52728a9294d97de808795b8e3f60fb8de50c00 (diff) | |
| download | linux-4.12.y-73b098d6fa175e4ecd98e6c1fe53c77ebf6b3eaa.tar.gz | |
Merge branch 'net-fix-loadable-module-for-DPAA-Ethernet'
Madalin Bucur says:
====================
net: fix loadable module for DPAA Ethernet
The DPAA Ethernet makes use of a symbol that is not exported.
Address the issue by propagating the dma_ops rather than calling
arch_setup_dma_ops().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/mac.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 9a520e4f0df9a0..290ad0563320d6 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2647,7 +2647,7 @@ static int dpaa_eth_probe(struct platform_device *pdev) priv->buf_layout[TX].priv_data_size = DPAA_TX_PRIV_DATA_SIZE; /* Tx */ /* device used for DMA mapping */ - arch_setup_dma_ops(dev, 0, 0, NULL, false); + set_dma_ops(dev, get_dma_ops(&pdev->dev)); err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40)); if (err) { dev_err(dev, "dma_coerce_mask_and_coherent() failed\n"); diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 0b31f8502adae2..6e67d22fd0d54f 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -623,6 +623,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id, goto no_mem; } + set_dma_ops(&pdev->dev, get_dma_ops(priv->dev)); + ret = platform_device_add_data(pdev, &data, sizeof(data)); if (ret) goto err; |