]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: call er16flash() instead of __er16flash()
authorBruce Allan <bruce.w.allan@intel.com>
Sat, 17 Dec 2011 08:32:57 +0000 (08:32 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:15:16 +0000 (15:15 +0800)
__er16flash() is not meant to be called directly.

(cherry picked from commit c8243ee0488d9bc12995ca7ea02f651db820622e)
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 140fad3b5f183df5b1ff36225c56e5b5e7cefbcb..5933e0fd30b53bd57a33a3386af23f9ec5c5833f 100644 (file)
@@ -2275,7 +2275,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;