diff mbox series

[02/15] net: pcnet: Drop PCNET_HAS_PROM

Message ID 20200517162425.76584-2-marek.vasut+renesas@gmail.com
State Accepted
Commit b92b8f48fb47c48b3f9df91ea1009b5789d55e19
Headers show
Series [01/15] net: pcnet: Drop typedef struct pcnet_priv_t | expand

Commit Message

Marek Vasut May 17, 2020, 4:24 p.m. UTC 
All of one PCNET users has this option set, make this default
and drop this config option.

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
Cc: Joe Hershberger <joe.hershberger at ni.com>
---
 drivers/net/pcnet.c     | 5 -----
 include/configs/malta.h | 1 -
 2 files changed, 6 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index f34fc4abbf..15d102d3a9 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -238,10 +238,7 @@  static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 {
 	int chip_version;
 	char *chipname;
-
-#ifdef PCNET_HAS_PROM
 	int i;
-#endif
 
 	/* Reset the PCnet controller */
 	pcnet_reset(dev);
@@ -276,7 +273,6 @@  static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 
 	PCNET_DEBUG1("AMD %s\n", chipname);
 
-#ifdef PCNET_HAS_PROM
 	/*
 	 * In most chips, after a chip reset, the ethernet address is read from
 	 * the station address PROM at the base address and programmed into the
@@ -290,7 +286,6 @@  static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 		dev->enetaddr[2 * i] = val & 0x0ff;
 		dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
 	}
-#endif /* PCNET_HAS_PROM */
 
 	return 0;
 }
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 773d7c23ed..82c90042d9 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -16,7 +16,6 @@ 
 #define CONFIG_PCI_GT64120
 #define CONFIG_PCI_MSC01
 #define CONFIG_PCNET
-#define PCNET_HAS_PROM
 
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0