[TG3]: Clean up grc_local_ctrl usage.

Make the code more readable by only flipping the specific
bits that need to change each register write.

Signed-off-by: Grant Grundler (grundler@parisc-linux.org)
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0a09d933a770d6ecea229eec24c692cde229f09b..74ed0863ca975dac50d556784827b73f46c34dac 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -893,7 +893,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                              GRC_LCLCTRL_GPIO_OUTPUT1));
                        udelay(100);
                } else {
-                       int no_gpio2;
+                       u32 no_gpio2;
                        u32 grc_local_ctrl;
 
                        if (tp_peer != tp &&
@@ -901,8 +901,8 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                                return;
 
                        /* On 5753 and variants, GPIO2 cannot be used. */
-                       no_gpio2 = (tp->nic_sram_data_cfg &
-                                   NIC_SRAM_DATA_CFG_NO_GPIO2) != 0;
+                       no_gpio2 = tp->nic_sram_data_cfg &
+                                   NIC_SRAM_DATA_CFG_NO_GPIO2;
 
                        grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
                                         GRC_LCLCTRL_GPIO_OE1 |
@@ -914,29 +914,17 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                                                    GRC_LCLCTRL_GPIO_OUTPUT2);
                        }
                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                              grc_local_ctrl);
+                                               grc_local_ctrl);
                        udelay(100);
 
-                       grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
-                                        GRC_LCLCTRL_GPIO_OE1 |
-                                        GRC_LCLCTRL_GPIO_OE2 |
-                                        GRC_LCLCTRL_GPIO_OUTPUT0 |
-                                        GRC_LCLCTRL_GPIO_OUTPUT1 |
-                                        GRC_LCLCTRL_GPIO_OUTPUT2;
-                       if (no_gpio2) {
-                               grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 |
-                                                   GRC_LCLCTRL_GPIO_OUTPUT2);
-                       }
+                       grc_local_ctrl |= GRC_LCLCTRL_GPIO_OUTPUT0;
+
                        tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-                              grc_local_ctrl);
+                                               grc_local_ctrl);
                        udelay(100);
 
-                       grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
-                                        GRC_LCLCTRL_GPIO_OE1 |
-                                        GRC_LCLCTRL_GPIO_OE2 |
-                                        GRC_LCLCTRL_GPIO_OUTPUT0 |
-                                        GRC_LCLCTRL_GPIO_OUTPUT1;
                        if (!no_gpio2) {
+                               grc_local_ctrl &= ~GRC_LCLCTRL_GPIO_OUTPUT2;
                                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
                                       grc_local_ctrl);
                                udelay(100);