2002-10-23 00:55:55

by Frank Davis

[permalink] [raw]
Subject: [PATCH] 2.5.44-ac1 : drivers/net/wan/ remove STATIC macro

Hello all,
The following patches remove STATIC macro references.

Regards,
Frank

--- linux/drivers/net/wan/sdlamain.c.old Sat Oct 19 12:05:27 2002
+++ linux/drivers/net/wan/sdlamain.c Tue Oct 22 20:24:24 2002
@@ -173,12 +173,6 @@

/****** Defines & Macros ****************************************************/

-#ifdef _DEBUG_
-#define STATIC
-#else
-#define STATIC static
-#endif
-
#define DRV_VERSION 5 /* version number */
#define DRV_RELEASE 0 /* release (minor version) number */
#define MAX_CARDS 16 /* max number of adapters */
@@ -209,7 +203,7 @@
static int ioctl_exec (sdla_t* card, sdla_exec_t* u_exec, int);

/* Miscellaneous functions */
-STATIC void sdla_isr (int irq, void* dev_id, struct pt_regs *regs);
+static void sdla_isr (int irq, void* dev_id, struct pt_regs *regs);
static void release_hw (sdla_t *card);
static void run_wanpipe_tq (unsigned long);

@@ -1092,7 +1086,7 @@
* o acknowledge SDLA hardware interrupt.
* o call protocol-specific interrupt service routine, if any.
*/
-STATIC void sdla_isr (int irq, void* dev_id, struct pt_regs *regs)
+static void sdla_isr (int irq, void* dev_id, struct pt_regs *regs)
{
#define card ((sdla_t*)dev_id)


--- linux/drivers/net/wan/wanpipe_multppp.c.old Sat Oct 19 12:05:27 2002
+++ linux/drivers/net/wan/wanpipe_multppp.c Tue Oct 22 20:27:10 2002
@@ -58,12 +58,6 @@

/****** Defines & Macros ****************************************************/

-#ifdef _DEBUG_
-#define STATIC
-#else
-#define STATIC static
-#endif
-
/* reasons for enabling the timer interrupt on the adapter */
#define TMR_INT_ENABLED_UDP 0x01
#define TMR_INT_ENABLED_UPDATE 0x02
@@ -1347,7 +1341,7 @@
/*============================================================================
* Cisco HDLC interrupt service routine.
*/
-STATIC void wsppp_isr (sdla_t* card)
+static void wsppp_isr (sdla_t* card)
{
netdevice_t* dev;
SHARED_MEMORY_INFO_STRUCT* flags = NULL;