]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: replace '1' with 'true' for boolean get_link_status
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 1 Feb 2012 11:16:42 +0000 (11:16 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:48:42 +0000 (15:48 +0800)
(cherry picked from commit f92518ddec7ce0ef2f7e91ae5f07e0a9e19055bf)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/netdev.c
drivers/net/e1000e/phy.c

index 33a993299bd6ba2e1609259a42043ab310cb9e73..926a55b37c06e7f3e98258d90f7b1a401779bed2 100644 (file)
@@ -1645,7 +1645,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data)
         */
 
        if (icr & E1000_ICR_LSC) {
-               hw->mac.get_link_status = 1;
+               hw->mac.get_link_status = true;
                /*
                 * ICH8 workaround-- Call gig speed drop workaround on cable
                 * disconnect (LSC) before accessing any PHY registers
@@ -1711,7 +1711,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
         */
 
        if (icr & E1000_ICR_LSC) {
-               hw->mac.get_link_status = 1;
+               hw->mac.get_link_status = true;
                /*
                 * ICH8 workaround-- Call gig speed drop workaround on cable
                 * disconnect (LSC) before accessing any PHY registers
@@ -1768,7 +1768,7 @@ static irqreturn_t e1000_msix_other(int irq, void *data)
        if (icr & E1000_ICR_OTHER) {
                if (!(icr & E1000_ICR_LSC))
                        goto no_link_interrupt;
-               hw->mac.get_link_status = 1;
+               hw->mac.get_link_status = true;
                /* guard against interrupt when we're going down */
                if (!test_bit(__E1000_DOWN, &adapter->state))
                        mod_timer(&adapter->watchdog_timer, jiffies + 1);
index e8ad0804702fea090bc5fc6407d1b7d8e109f423..6f44c3fb80b6b30d2abf8f0f6e086852aa9ce2f7 100644 (file)
@@ -1141,7 +1141,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
                }
        }
 
-       hw->mac.get_link_status = 1;
+       hw->mac.get_link_status = true;
 
        return ret_val;
 }