This patch contains the following possible cleanups:
- make needlessly global functions static
- remove unused code
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/net/sk98lin/h/skaddr.h | 48 ---
drivers/net/sk98lin/h/skcsum.h |6
drivers/net/sk98lin/h/skdrv2nd.h |1
drivers/net/sk98lin/h/skgeinit.h | 56 ---
drivers/net/sk98lin/h/skgepnmi.h |4
drivers/net/sk98lin/h/skgesirq.h |1
drivers/net/sk98lin/h/ski2c.h|3
drivers/net/sk98lin/h/skvpd.h| 15 -
drivers/net/sk98lin/skaddr.c | 35 +-
drivers/net/sk98lin/skcsum.c | 252
drivers/net/sk98lin/skgeinit.c | 148 -
drivers/net/sk98lin/skgemib.c|7
drivers/net/sk98lin/skgepnmi.c | 153 --
drivers/net/sk98lin/skgesirq.c | 24 -
drivers/net/sk98lin/ski2c.c |6
drivers/net/sk98lin/sklm80.c | 72
drivers/net/sk98lin/skrlmt.c |1
drivers/net/sk98lin/skvpd.c | 108 ---
drivers/net/sk98lin/skxmac2.c| 461 ---
19 files changed, 40 insertions(+), 1361 deletions(-)
--- linux-2.6.12-rc2-mm3-full/drivers/net/sk98lin/h/skaddr.h.old
2005-04-19 23:34:34.0 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/net/sk98lin/h/skaddr.h2005-04-19
23:42:57.0 +0200
@@ -236,18 +236,6 @@
SK_U32 PortNumber,
int Flags);
-extern int SkAddrXmacMcClear(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- int Flags);
-
-extern int SkAddrGmacMcClear(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- int Flags);
-
extern int SkAddrMcAdd(
SK_AC *pAC,
SK_IOC IoC,
@@ -255,35 +243,11 @@
SK_MAC_ADDR *pMc,
int Flags);
-extern int SkAddrXmacMcAdd(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- SK_MAC_ADDR *pMc,
- int Flags);
-
-extern int SkAddrGmacMcAdd(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- SK_MAC_ADDR *pMc,
- int Flags);
-
extern int SkAddrMcUpdate(
SK_AC *pAC,
SK_IOC IoC,
SK_U32 PortNumber);
-extern int SkAddrXmacMcUpdate(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber);
-
-extern int SkAddrGmacMcUpdate(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber);
-
extern int SkAddrOverride(
SK_AC *pAC,
SK_IOC IoC,
@@ -297,18 +261,6 @@
SK_U32 PortNumber,
int NewPromMode);
-extern int SkAddrXmacPromiscuousChange(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- int NewPromMode);
-
-extern int SkAddrGmacPromiscuousChange(
- SK_AC *pAC,
- SK_IOC IoC,
- SK_U32 PortNumber,
- int NewPromMode);
-
#ifndef SK_SLIM
extern int SkAddrSwap(
SK_AC *pAC,
--- linux-2.6.12-rc2-mm3-full/drivers/net/sk98lin/skaddr.c.old 2005-04-19
23:34:50.0 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/net/sk98lin/skaddr.c 2005-04-20
00:01:12.0 +0200
@@ -87,6 +87,21 @@
static int Next0[SK_MAX_MACS] = {0};
#endif /* DEBUG */
+static int SkAddrGmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+ SK_MAC_ADDR *pMc, int Flags);
+static int SkAddrGmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+int Flags);
+static int SkAddrGmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
+static int SkAddrGmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
+ SK_U32 PortNumber, int NewPromMode);
+static int SkAddrXmacMcAdd(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+ SK_MAC_ADDR *pMc, int Flags);
+static int SkAddrXmacMcClear(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber,
+int Flags);
+static int SkAddrXmacMcUpdate(SK_AC *pAC, SK_IOC IoC, SK_U32 PortNumber);
+static int SkAddrXmacPromiscuousChange(SK_AC *pAC, SK_IOC IoC,
+ SK_U32 PortNumber, int NewPromMode);
+
/* functions
**/
/**
@@ -372,7 +387,7 @@
* SK_ADDR_SUCCESS
* SK_ADDR_ILLEGAL_PORT
*/
-intSkAddrXmacMcClear(
+static int SkAddrXmacMcClear(
SK_AC *pAC, /* adapter context */
SK_IOC IoC,/* I/O context */
SK_U32 PortNumber, /* Index of affected port */
@@ -429,7 +444,7 @@
* SK_ADDR_SUCCESS
* SK_ADDR_ILLEGAL_PORT
*/
-intSkAddrGmacMcClear(
+static int SkAddrGmacMcClear(
SK_AC *pAC, /* adapter context */
SK_IOC IoC,/* I/O context */
SK_U32 PortNumber, /* Index of affec