• Francois Romieu's avatar
    e1000: remove dead e1000_init_eeprom_params calls · 30772325
    Francois Romieu authored
    The device probe method e1000_probe calls e1000_init_eeprom_params
    itself so there's no reason to call it again from e1000_do_write_eeprom
    or e1000_do_read_eeprom.
    
    The sentence above assumes that e1000_init_eeprom_params is effective.
    e1000_init_eeprom_params depends mostly on hw->mac_type and e1000_probe
    bails out early if it can't set mac_type (see e1000_init_hw_struct, then
    e1000_set_mac_type), qed.
    
    Btw, if effective, the removed paths would had been deadlock prone when
    e1000_eeprom_spi was set:
    -> e1000_write_eeprom (takes e1000_eeprom_lock)
       -> e1000_do_write_eeprom
          -> e1000_init_eeprom_params
             -> e1000_read_eeprom (takes e1000_eeprom_lock)
    
    (same narrative with e1000_read_eeprom -> e1000_do_read_eeprom etc.)
    
    As a final note, the candidate deadlock above can't happen in e1000_probe
    due to the way eeprom->word_size is set / tested.
    Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
    Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
    Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
    30772325
e1000_hw.c 157 KB