Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc32918 authored by Joe Perches's avatar Joe Perches Committed by Jeff Garzik
Browse files

e1000: Use hw, er32, and ew32 



Use struct e1000_hw *hw = adapter->hw; where necessary
Change macros E1000_READ_REG and E1000_WRITE_REG to er32 and ew32

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 64798845

drivers/net/e1000/e1000_ethtool.c

+169 −144

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_hw.c

+381 −381

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_main.c

+472 −438

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/e1000/e1000_osdep.h

+7 −7
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ 
#define DEBUGOUT7 DEBUGOUT3





#define E1000_WRITE_REG(a, reg, value) ( \

    writel((value), ((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg))))

#define er32(reg)\

	(readl(hw->hw_addr + ((hw->mac_type >= e1000_82543)		\

			       ? E1000_##reg : E1000_82542_##reg)))



#define E1000_READ_REG(a, reg) ( \

    readl((a)->hw_addr + \

        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg)))

#define ew32(reg, value)						\

	(writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543)	\

					 ? E1000_##reg : E1000_82542_##reg))))



#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \

    writel((value), ((a)->hw_addr + \
@@ -96,7 +96,7 @@ 
        (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \

        (offset)))



#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)

#define E1000_WRITE_FLUSH() er32(STATUS)



#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \

    writel((value), ((a)->flash_address + reg)))