[linux-yocto] [PATCH 1/2] Revert "pch_gbe: Add board_eth_addr function pointer to hw.mac struct"

[Darren Hart]

This reverts commit c6e199184ea2ce13ec500418a8ed81de6621b91f.

The RC3 firmware and beyond manages to populate the MAC without the need
for the EFI var. Pretend this never happened.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    2 --
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    5 -----
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
index 81e7ff6..bd4e0c5 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
@@ -364,7 +364,6 @@ struct pch_gbe_functions {
  * @autoneg:		Auto negotiation enable
  * @link_speed:		Link speed
  * @link_duplex:	Link duplex
- * @board_eth_addr:	Board specific method to read the Ethernet address
  */
 struct pch_gbe_mac_info {
 	u8 addr[6];
@@ -376,7 +375,6 @@ struct pch_gbe_mac_info {
 	u8 autoneg;
 	u16 link_speed;
 	u16 link_duplex;
-	void (*board_eth_addr) (u8 *addr);
 };
 
 /**
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index b8a2bb1..f487ad7 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -2608,7 +2608,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
 	if (minnow_detect()) {
 		adapter->hw.phy.tx_clk_delay = true;
 		minnow_phy_reset();
-		adapter->hw.mac.board_eth_addr = minnow_eth_addr;
 	}
 
 	adapter->netdev = netdev;
@@ -2654,10 +2653,6 @@ static int pch_gbe_probe(struct pci_dev *pdev,
 	pch_gbe_hal_get_bus_info(&adapter->hw);
 
 	/* Read the MAC address. and store to the private data */
-	if (adapter->hw.mac.board_eth_addr) {
-		adapter->hw.mac.board_eth_addr(adapter->hw.mac.addr);
-		pch_gbe_mac_mar_set(&adapter->hw, adapter->hw.mac.addr, 0);
-	}
 	ret = pch_gbe_hal_read_mac_addr(&adapter->hw);
 	if (ret) {
 		dev_err(&pdev->dev, "MAC address Read Error\n");
-- 
1.7.5.4