Merge remote-tracking branch 'net-next/master'

[linux] / drivers / net / ethernet / freescale / dpaa2 / dpaa2-eth.c

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 87777b0..967ea5e 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -1900,7 +1900,7 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)
 
                /* Register the new context */
                channel->dpio = dpaa2_io_service_select(i);
-               err = dpaa2_io_service_register(channel->dpio, nctx);
+               err = dpaa2_io_service_register(channel->dpio, nctx, dev);
                if (err) {
                        dev_dbg(dev, "No affine DPIO for cpu %d\n", i);
                        /* If no affine DPIO for this core, there's probably
@@ -1940,7 +1940,7 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)
        return 0;
 
 err_set_cdan:
-       dpaa2_io_service_deregister(channel->dpio, nctx);
+       dpaa2_io_service_deregister(channel->dpio, nctx, dev);
 err_service_reg:
        free_channel(priv, channel);
 err_alloc_ch:
@@ -1960,13 +1960,14 @@ err_alloc_ch:
 
 static void free_dpio(struct dpaa2_eth_priv *priv)
 {
-       int i;
+       struct device *dev = priv->net_dev->dev.parent;
        struct dpaa2_eth_channel *ch;
+       int i;
 
        /* deregister CDAN notifications and free channels */
        for (i = 0; i < priv->num_channels; i++) {
                ch = priv->channel[i];
-               dpaa2_io_service_deregister(ch->dpio, &ch->nctx);
+               dpaa2_io_service_deregister(ch->dpio, &ch->nctx, dev);
                free_channel(priv, ch);
        }
 }