]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: dm9000: Drop dm9000.h and staticize SROM access
authorMarek Vasut <marex@denx.de>
Wed, 13 Apr 2022 02:15:33 +0000 (04:15 +0200)
committerRamon Fried <ramon@neureality.ai>
Wed, 13 Apr 2022 12:13:54 +0000 (15:13 +0300)
Dispose of dm9000.h because none of the function prototypes declared in
it are called anywhere in the codebase. Staticize dm9000_read_srom_word()
because it is now called only from within the dm9000 driver. Drop
dm9000_write_srom_word() because it is no longer used.

Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Ramon Fried <rfried.dev@gmail.com>
drivers/net/dm9000x.c
include/dm9000.h [deleted file]

index 36411bd8ebdffd5ad52d1fe8705bbabbd656e5ee..a8ce8ac02ee56782a350b95b6f1a70b45f831529 100644 (file)
@@ -54,7 +54,6 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/io.h>
-#include <dm9000.h>
 #include <linux/delay.h>
 
 #include "dm9000x.h"
@@ -557,7 +556,7 @@ static int dm9000_rx(struct eth_device *dev)
  * Read a word data from SROM
  */
 #if !defined(CONFIG_DM9000_NO_SROM)
-void dm9000_read_srom_word(int offset, u8 *to)
+static void dm9000_read_srom_word(int offset, u8 *to)
 {
        dm9000_iow(DM9000_EPAR, offset);
        dm9000_iow(DM9000_EPCR, 0x4);
@@ -567,16 +566,6 @@ void dm9000_read_srom_word(int offset, u8 *to)
        to[1] = dm9000_ior(DM9000_EPDRH);
 }
 
-void dm9000_write_srom_word(int offset, u16 val)
-{
-       dm9000_iow(DM9000_EPAR, offset);
-       dm9000_iow(DM9000_EPDRH, ((val >> 8) & 0xff));
-       dm9000_iow(DM9000_EPDRL, (val & 0xff));
-       dm9000_iow(DM9000_EPCR, 0x12);
-       mdelay(8);
-       dm9000_iow(DM9000_EPCR, 0);
-}
-
 static void dm9000_get_enetaddr(struct eth_device *dev)
 {
        int i;
diff --git a/include/dm9000.h b/include/dm9000.h
deleted file mode 100644 (file)
index f780e51..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * NOTE:        DAVICOM DM9000 ethernet driver interface
- *
- * Authors:     Remy Bohmer <linux@bohmer.net>
- */
-#ifndef __DM9000_H__
-#define __DM9000_H__
-
-/******************  function prototypes **********************/
-#if !defined(CONFIG_DM9000_NO_SROM)
-void dm9000_write_srom_word(int offset, u16 val);
-void dm9000_read_srom_word(int offset, u8 *to);
-#endif
-
-#endif /* __DM9000_H__ */