diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2015-05-19 10:01:20 -0700 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-08-11 13:17:07 -0500 |
| commit | 48b168bbfa97e4ebb7c093696c27dfb32bf82ad8 (patch) | |
| tree | 3b78a63a121cf9208c877121c49dd174ad0c8bd4 /drivers/net/e1000.c | |
| parent | 3c63dd5302a2f14c292a469b9934a8fc02b627cc (diff) | |
| download | blackbird-obmc-uboot-48b168bbfa97e4ebb7c093696c27dfb32bf82ad8.tar.gz blackbird-obmc-uboot-48b168bbfa97e4ebb7c093696c27dfb32bf82ad8.zip | |
e1000: remove unnecessary clearing of SWSM.SWSM_SMBI
remove unnecessary clearing of SWSM.SWSM_SMBI when obtaining the SW
semaphore. This was introduced in 951860634fdb557bbb58e0f99215391bc0c29779
while adding i210 support and should be now resolved by releasing the
semaphore when no longer needed.
Cc: Marcel Ziswiler <marcel@ziswiler.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Aneesh Bansal <aneesh.bansal@freescale.com>
Cc: Naveen Burmi <NaveenBurmi@freescale.com>
Cc: Po Liu <po.liu@freescale.com>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 739d24b280..ecd1a52e47 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -996,10 +996,6 @@ e1000_get_software_semaphore(struct e1000_hw *hw) DEBUGFUNC(); - swsm = E1000_READ_REG(hw, SWSM); - swsm &= ~E1000_SWSM_SMBI; - E1000_WRITE_REG(hw, SWSM, swsm); - if (hw->mac_type != e1000_80003es2lan) return E1000_SUCCESS; |
