From: Bruce Allan Date: Wed, 1 Feb 2012 11:16:42 +0000 (+0000) Subject: e1000e: replace '1' with 'true' for boolean get_link_status X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~329 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b11a6437edae25c596f32582c6d7c6001922544a;p=users%2Fjedix%2Flinux-maple.git e1000e: replace '1' with 'true' for boolean get_link_status (cherry picked from commit f92518ddec7ce0ef2f7e91ae5f07e0a9e19055bf) Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: Joe Jin --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 33a993299bd6..926a55b37c06 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -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); diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index e8ad0804702f..6f44c3fb80b6 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c @@ -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; }