]> err.no Git - linux-2.6/commitdiff
DM9000: Remove EEPROM initialisation code.
authorBen Dooks <ben-linux@fluff.org>
Tue, 5 Feb 2008 00:02:13 +0000 (00:02 +0000)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 16:06:30 +0000 (11:06 -0500)
Remove the old hack to program an initial EEPROM setting
into the DM9000 as we now have ethtool support for reading
and writing the EEPROM.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/dm9000.c

index 2acab02a6428f7f8819d481fbd99e0850c3b682d..3bef3b25ff0ec2f533418b6d8f555f3851d056da 100644 (file)
@@ -191,10 +191,6 @@ static void dm9000_write_eeprom(board_info_t *, int addr, u8 *dp);
 static void dm9000_rx(struct net_device *);
 static void dm9000_hash_table(struct net_device *);
 
-//#define DM9000_PROGRAM_EEPROM
-#ifdef DM9000_PROGRAM_EEPROM
-static void program_eeprom(board_info_t * db);
-#endif
 /* DM9000 network board routine ---------------------------- */
 
 static void
@@ -699,9 +695,6 @@ dm9000_probe(struct platform_device *pdev)
        ndev->poll_controller    = &dm9000_poll_controller;
 #endif
 
-#ifdef DM9000_PROGRAM_EEPROM
-       program_eeprom(db);
-#endif
        db->msg_enable       = NETIF_MSG_LINK;
        db->mii.phy_id_mask  = 0x1f;
        db->mii.reg_num_mask = 0x1f;
@@ -1112,28 +1105,6 @@ dm9000_write_eeprom(board_info_t *db, int offset, u8 *data)
        mutex_unlock(&db->addr_lock);
 }
 
-#ifdef DM9000_PROGRAM_EEPROM
-/*
- * Only for development:
- * Here we write static data to the eeprom in case
- * we don't have valid content on a new board
- */
-static void
-program_eeprom(board_info_t * db)
-{
-       u16 eeprom[] = { 0x0c00, 0x007f, 0x1300,        /* MAC Address */
-               0x0000,         /* Autoload: accept nothing */
-               0x0a46, 0x9000, /* Vendor / Product ID */
-               0x0000,         /* pin control */
-               0x0000,
-       };                      /* Wake-up mode control */
-       int i;
-       for (i = 0; i < 8; i++)
-               write_srom_word(db, i, eeprom[i]);
-}
-#endif
-
-
 /*
  *  Calculate the CRC valude of the Rx packet
  *  flag = 1 : return the reverse CRC (for the received packet CRC)