[PATCH] Fix warnings in ibm_emac driver

This patch fixes annoying warnings in ibm_emac driver.

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index a68b29245b90cc8f6542c2e57f1135f43057c838..39c65064c046080d467a54de795221f33b5bf444 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -620,7 +620,7 @@ emac_rx_csum(struct net_device *dev, unsigned short ctrl, struct sk_buff *skb)
 
 static int emac_rx_clean(struct net_device *dev)
 {
-       int i, b, bnum, buf[6];
+       int i, b, bnum = 0, buf[6];
        int error, frame_length;
        struct ocp_enet_private *fep = dev->priv;
        unsigned short ctrl;
@@ -1021,7 +1021,6 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static int emac_adjust_to_link(struct ocp_enet_private *fep)
 {
        emac_t *emacp = fep->emacp;
-       struct ibm_ocp_rgmii *rgmii;
        unsigned long mode_reg;
        int full_duplex, speed;
 
@@ -1038,21 +1037,23 @@ static int emac_adjust_to_link(struct ocp_enet_private *fep)
                speed = fep->phy_mii.speed;
        }
 
-       if (fep->rgmii_dev)
-               rgmii = RGMII_PRIV(fep->rgmii_dev);
 
        /* set speed (default is 10Mb) */
        switch (speed) {
        case SPEED_1000:
                mode_reg |= EMAC_M1_JUMBO_ENABLE | EMAC_M1_RFS_16K;
-               if ((rgmii->mode[fep->rgmii_input] == RTBI)
-                   || (rgmii->mode[fep->rgmii_input] == TBI))
-                       mode_reg |= EMAC_M1_MF_1000GPCS;
-               else
-                       mode_reg |= EMAC_M1_MF_1000MBPS;
-               if (fep->rgmii_dev)
+               if (fep->rgmii_dev) {
+                       struct ibm_ocp_rgmii *rgmii = RGMII_PRIV(fep->rgmii_dev);
+
+                       if ((rgmii->mode[fep->rgmii_input] == RTBI)
+                           || (rgmii->mode[fep->rgmii_input] == TBI))
+                               mode_reg |= EMAC_M1_MF_1000GPCS;
+                       else
+                               mode_reg |= EMAC_M1_MF_1000MBPS;
+
                        emac_rgmii_port_speed(fep->rgmii_dev, fep->rgmii_input,
                                              1000);
+               }
                break;
        case SPEED_100:
                mode_reg |= EMAC_M1_MF_100MBPS | EMAC_M1_RFS_4K;

diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h
index 8e456ce5af7d5af30d0b0f0542cf6786b58d504c..dd9f0dabc6e0a4fdf3f4fc5573083a107c7116c8 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_mal.h
+++ b/drivers/net/ibm_emac/ibm_emac_mal.h
@@ -83,6 +83,7 @@ struct ibm_ocp_mal {
                GET_MAL0_STANZA(dcrn) \
                GET_MAL1_STANZA(dcrn) \
        default: \
+               x = 0; \
                BUG(); \
        } \
 x; })