]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: cleanup: remove unnecessary variable initializations
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 8 Feb 2012 02:55:35 +0000 (02:55 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:50:00 +0000 (15:50 +0800)
(cherry picked from commit f71dde6a44c6f817a104ab8a95a2eeabac5614df)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/ich8lan.c

index 803569509c933d55f01f4816e42fe05fdaaa67e0..767743cc24f6fb7790bc2aa5731b331f5acd5f23 100644 (file)
@@ -2114,7 +2114,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
        u32 bank1_offset = nvm->flash_bank_size * sizeof(u16);
        u32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;
        u8 sig_byte = 0;
-       s32 ret_val = 0;
+       s32 ret_val;
 
        switch (hw->mac.type) {
        case e1000_ich8lan:
@@ -2268,7 +2268,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                ret_val = 0;
        } else {
-               s32 i = 0;
+               s32 i;
 
                /*
                 * Otherwise poll for sometime so the current