net: axienet: Remove unused parameter from __axienet_device_reset

[cascardo/linux.git] / drivers / net / ethernet / xilinx / xilinx_axienet_main.c

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 36ee7ab..c688d68 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -431,8 +431,7 @@ static void axienet_setoptions(struct net_device *ndev, u32 options)
        lp->options |= options;
 }
 
-static void __axienet_device_reset(struct axienet_local *lp,
-                                  struct device *dev, off_t offset)
+static void __axienet_device_reset(struct axienet_local *lp, off_t offset)
 {
        u32 timeout;
        /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset
@@ -468,8 +467,8 @@ static void axienet_device_reset(struct net_device *ndev)
        u32 axienet_status;
        struct axienet_local *lp = netdev_priv(ndev);
 
-       __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
-       __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+       __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
+       __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
 
        lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
        lp->options |= XAE_OPTION_VLAN;
@@ -818,7 +817,7 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
                goto out;
        }
        if (!(status & XAXIDMA_IRQ_ALL_MASK))
-               dev_err(&ndev->dev, "No interrupts asserted in Tx path");
+               dev_err(&ndev->dev, "No interrupts asserted in Tx path\n");
        if (status & XAXIDMA_IRQ_ERROR_MASK) {
                dev_err(&ndev->dev, "DMA Tx error 0x%x\n", status);
                dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
@@ -867,7 +866,7 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
                goto out;
        }
        if (!(status & XAXIDMA_IRQ_ALL_MASK))
-               dev_err(&ndev->dev, "No interrupts asserted in Rx path");
+               dev_err(&ndev->dev, "No interrupts asserted in Rx path\n");
        if (status & XAXIDMA_IRQ_ERROR_MASK) {
                dev_err(&ndev->dev, "DMA Rx error 0x%x\n", status);
                dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
@@ -1297,7 +1296,7 @@ static int axienet_ethtools_set_coalesce(struct net_device *ndev,
        return 0;
 }
 
-static struct ethtool_ops axienet_ethtool_ops = {
+static const struct ethtool_ops axienet_ethtool_ops = {
        .get_drvinfo    = axienet_ethtools_get_drvinfo,
        .get_regs_len   = axienet_ethtools_get_regs_len,
        .get_regs       = axienet_ethtools_get_regs,
@@ -1338,8 +1337,8 @@ static void axienet_dma_err_handler(unsigned long data)
        axienet_iow(lp, XAE_MDIO_MC_OFFSET, (mdio_mcreg &
                    ~XAE_MDIO_MC_MDIOEN_MASK));
 
-       __axienet_device_reset(lp, &ndev->dev, XAXIDMA_TX_CR_OFFSET);
-       __axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
+       __axienet_device_reset(lp, XAXIDMA_TX_CR_OFFSET);
+       __axienet_device_reset(lp, XAXIDMA_RX_CR_OFFSET);
 
        axienet_iow(lp, XAE_MDIO_MC_OFFSET, mdio_mcreg);
        axienet_mdio_wait_until_ready(lp);