sf: add paired dev info for winbond w25q16jv

[u-boot] / drivers / net / dm9000x.c

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index b68d808c74287f010bd29d5a740de617082b60f9..a6c0a2452f2c8bcb76019f2eaff401f6f760131e 100644 (file)
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
   dm9000.c: Version 1.2 12/15/2003
 
        A Davicom DM9000 ISA NIC fast Ethernet driver for Linux.
        Copyright (C) 1997  Sten Wang
 
- * SPDX-License-Identifier:    GPL-2.0+
-
   (C)Copyright 1997-1998 DAVICOM Semiconductor,Inc. All Rights Reserved.
 
 V0.11  06/20/2001      REG_0A bit3=1, default enable BP with DA match
@@ -342,14 +341,8 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
        DM9000_iow(DM9000_ISR, ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS);
 
        printf("MAC: %pM\n", dev->enetaddr);
-       if (!is_valid_ether_addr(dev->enetaddr)) {
-#ifdef CONFIG_RANDOM_MACADDR
-               printf("Bad MAC address (uninitialized EEPROM?), randomizing\n");
-               eth_random_enetaddr(dev->enetaddr);
-               printf("MAC: %pM\n", dev->enetaddr);
-#else
+       if (!is_valid_ethaddr(dev->enetaddr)) {
                printf("WARNING: Bad MAC address (uninitialized EEPROM?)\n");
-#endif
        }
 
        /* fill device MAC address registers */
@@ -464,7 +457,8 @@ static void dm9000_halt(struct eth_device *netdev)
 */
 static int dm9000_rx(struct eth_device *netdev)
 {
-       u8 rxbyte, *rdptr = (u8 *) NetRxPackets[0];
+       u8 rxbyte;
+       u8 *rdptr = (u8 *)net_rx_packets[0];
        u16 RxStatus, RxLen = 0;
        struct board_info *db = &dm9000_info;
 
@@ -525,7 +519,7 @@ static int dm9000_rx(struct eth_device *netdev)
                        DM9000_DMP_PACKET(__func__ , rdptr, RxLen);
 
                        DM9000_DBG("passing packet to upper layer\n");
-                       NetReceive(NetRxPackets[0], RxLen);
+                       net_process_received_packet(net_rx_packets[0], RxLen);
                }
        }
        return 0;
@@ -635,7 +629,7 @@ int dm9000_initialize(bd_t *bis)
        dev->halt = dm9000_halt;
        dev->send = dm9000_send;
        dev->recv = dm9000_rx;
-       sprintf(dev->name, "dm9000");
+       strcpy(dev->name, "dm9000");
 
        eth_register(dev);