Commit 73b098d6 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents fe420d87 fb52728a
...@@ -2647,7 +2647,7 @@ static int dpaa_eth_probe(struct platform_device *pdev) ...@@ -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 */ priv->buf_layout[TX].priv_data_size = DPAA_TX_PRIV_DATA_SIZE; /* Tx */
/* device used for DMA mapping */ /* 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)); err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
if (err) { if (err) {
dev_err(dev, "dma_coerce_mask_and_coherent() failed\n"); dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");
......
...@@ -623,6 +623,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id, ...@@ -623,6 +623,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id,
goto no_mem; goto no_mem;
} }
set_dma_ops(&pdev->dev, get_dma_ops(priv->dev));
ret = platform_device_add_data(pdev, &data, sizeof(data)); ret = platform_device_add_data(pdev, &data, sizeof(data));
if (ret) if (ret)
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment