e1000e: call er16flash() instead of __er16flash()
authorBruce Allan <bruce.w.allan@intel.com>
Sat, 17 Dec 2011 08:32:57 +0000 (08:32 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 27 Jan 2012 02:58:33 +0000 (18:58 -0800)
__er16flash() is not meant to be called directly.

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>
drivers/net/ethernet/intel/e1000e/ich8lan.c

index 53e5447cbbca808d2eec3f821db47df328903d72..070a90f78aa9b759007a2ba26d28e3e0157f0bc8 100644 (file)
@@ -2279,7 +2279,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                 * cycle has a chance to end before giving up.
                 */
                for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
-                       hsfsts.regval = __er16flash(hw, ICH_FLASH_HSFSTS);
+                       hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
                        if (hsfsts.hsf_status.flcinprog == 0) {
                                ret_val = 0;
                                break;