net: fman: Change return type of disable to void

When disabling, there is nothing we can do about errors. In fact, the
only error which can occur is misuse of the API. Just warn in the mac
driver instead.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Acked-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 02b588c..d378247 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -290,10 +290,7 @@ static int dpaa_stop(struct net_device *net_dev)
 
        if (mac_dev->phy_dev)
                phy_stop(mac_dev->phy_dev);
-       err = mac_dev->disable(mac_dev->fman_mac);
-       if (err < 0)
-               netif_err(priv, ifdown, net_dev, "mac_dev->disable() = %d\n",
-                         err);
+       mac_dev->disable(mac_dev->fman_mac);
 
        for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
                error = fman_port_disable(mac_dev->port[i]);

diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
index 7acd574..f2dd07b 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c
@@ -871,13 +871,12 @@ static int dtsec_enable(struct fman_mac *dtsec)
        return 0;
 }
 
-static int dtsec_disable(struct fman_mac *dtsec)
+static void dtsec_disable(struct fman_mac *dtsec)
 {
        struct dtsec_regs __iomem *regs = dtsec->regs;
        u32 tmp;
 
-       if (!is_init_done(dtsec->dtsec_drv_param))
-               return -EINVAL;
+       WARN_ON_ONCE(!is_init_done(dtsec->dtsec_drv_param));
 
        /* Graceful stop - Assert the graceful Rx/Tx stop bit */
        graceful_stop(dtsec);
@@ -885,8 +884,6 @@ static int dtsec_disable(struct fman_mac *dtsec)
        tmp = ioread32be(&regs->maccfg1);
        tmp &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);
        iowrite32be(tmp, &regs->maccfg1);
-
-       return 0;
 }
 
 static int dtsec_set_tx_pause_frames(struct fman_mac *dtsec,

diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
index 0e0d941..fc79abd 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_memac.c
+++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
@@ -701,19 +701,17 @@ static int memac_enable(struct fman_mac *memac)
        return 0;
 }
 
-static int memac_disable(struct fman_mac *memac)
+static void memac_disable(struct fman_mac *memac)
+
 {
        struct memac_regs __iomem *regs = memac->regs;
        u32 tmp;
 
-       if (!is_init_done(memac->memac_drv_param))
-               return -EINVAL;
+       WARN_ON_ONCE(!is_init_done(memac->memac_drv_param));
 
        tmp = ioread32be(&regs->command_config);
        tmp &= ~(CMD_CFG_RX_EN | CMD_CFG_TX_EN);
        iowrite32be(tmp, &regs->command_config);
-
-       return 0;
 }
 
 static int memac_set_promiscuous(struct fman_mac *memac, bool new_val)

diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c
index 0a66ae5..1b60239 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
@@ -408,19 +408,16 @@ static int tgec_enable(struct fman_mac *tgec)
        return 0;
 }
 
-static int tgec_disable(struct fman_mac *tgec)
+static void tgec_disable(struct fman_mac *tgec)
 {
        struct tgec_regs __iomem *regs = tgec->regs;
        u32 tmp;
 
-       if (!is_init_done(tgec->cfg))
-               return -EINVAL;
+       WARN_ON_ONCE(!is_init_done(tgec->cfg));
 
        tmp = ioread32be(&regs->command_config);
        tmp &= ~(CMD_CFG_RX_EN | CMD_CFG_TX_EN);
        iowrite32be(tmp, &regs->command_config);
-
-       return 0;
 }
 
 static int tgec_set_promiscuous(struct fman_mac *tgec, bool new_val)

diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
index c5fb4d4..a55efcb 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@ -38,7 +38,7 @@ struct mac_device {
        bool allmulti;
 
        int (*enable)(struct fman_mac *mac_dev);
-       int (*disable)(struct fman_mac *mac_dev);
+       void (*disable)(struct fman_mac *mac_dev);
        void (*adjust_link)(struct mac_device *mac_dev);
        int (*set_promisc)(struct fman_mac *mac_dev, bool enable);
        int (*change_addr)(struct fman_mac *mac_dev, const enet_addr_t *enet_addr);