[PATCH] NULL noise removal in skfp

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 1f3b423f2635d40ab25bb2fc44679b141227ba3e..76e78442fc2470a340628c71c9a1cb79e4903c9a 100644 (file)
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -1075,7 +1075,7 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc,
                for (i = 0 ; i < 6 ; i++, p++)
                        *p = canonical[*p] ;
        }
-       slot = 0 ;
+       slot = NULL;
        for (i = 0, tb = smc->hw.fp.mc.table ; i < FPMAX_MULTICAST ; i++, tb++){
                if (!tb->n) {           /* not used */
                        if (!del && !slot)      /* if !del save first free */

diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index 8016c9ae14e127e7a08f6338e8fd008d5b9907fc..6a74332f0e8b2276bb01703898bad09d8ec28e5e 100644 (file)
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -1981,7 +1981,7 @@ void mac_drv_clear_txd(struct s_smc *smc)
 {
        struct s_smt_tx_queue *queue ;
        struct s_smt_fp_txd volatile *t1 ;
-       struct s_smt_fp_txd volatile *t2=0 ;
+       struct s_smt_fp_txd volatile *t2 = NULL ;
        SMbuf *mb ;
        u_long  tbctrl ;
        int i ;

diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index e9422e654cbf9f3937c41f8ec68a5b34856b4e9f..f2b446d8b0bffc90407dbdaf3f85afc738956097 100644 (file)
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -558,8 +558,8 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
 {
        struct smt_para *pa ;
        const struct s_p_tab    *pt ;
-       struct fddi_mib_m *mib_m = 0 ;
-       struct fddi_mib_p *mib_p = 0 ;
+       struct fddi_mib_m *mib_m = NULL;
+       struct fddi_mib_p *mib_p = NULL;
        int             len ;
        int             plen ;
        char            *from ;
@@ -644,7 +644,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
        /*
         * check special paras
         */
-       swap = 0 ;
+       swap = NULL;
        switch (para) {
        case SMT_P10F0 :
        case SMT_P10F1 :
@@ -1091,9 +1091,9 @@ int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, int local,
        char            c ;
        char            *mib_addr ;
        struct fddi_mib *mib ;
-       struct fddi_mib_m       *mib_m = 0 ;
-       struct fddi_mib_a       *mib_a = 0 ;
-       struct fddi_mib_p       *mib_p = 0 ;
+       struct fddi_mib_m       *mib_m = NULL;
+       struct fddi_mib_a       *mib_a = NULL;
+       struct fddi_mib_p       *mib_p = NULL;
        int             mac ;
        int             path ;
        int             port ;
@@ -1533,7 +1533,7 @@ static const struct s_p_tab *smt_get_ptab(u_short para)
        const struct s_p_tab    *pt ;
        for (pt = p_tab ; pt->p_num && pt->p_num != para ; pt++)
                ;
-       return(pt->p_num ? pt : 0) ;
+       return(pt->p_num ? pt : NULL) ;
 }
 
 static int smt_mib_phys(struct s_smc *smc)

diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 43f78c74c84537d0ca453ca930b17b7c28d80472..721569b5e4a065d5593717009aa7289700c8c829 100644 (file)
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1701,7 +1701,7 @@ void *sm_to_para(struct s_smc *smc, struct smt_header *sm, int para)
        char    *p ;
        int     len ;
        int     plen ;
-       void    *found = 0 ;
+       void    *found = NULL;
 
        SK_UNUSED(smc) ;
 
@@ -1715,16 +1715,16 @@ void *sm_to_para(struct s_smc *smc, struct smt_header *sm, int para)
                len -= plen ;
                if (len < 0) {
                        DB_SMT("SMT : sm_to_para - length error %d\n",plen,0) ;
-                       return(0) ;
+                       return NULL;
                }
                if ((plen & 3) && (para != SMT_P_ECHODATA)) {
                        DB_SMT("SMT : sm_to_para - odd length %d\n",plen,0) ;
-                       return(0) ;
+                       return NULL;
                }
                if (found)
                        return(found) ;
        }
-       return(0) ;
+       return NULL;
 }
 
 #if    0

diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/skfp/smtdef.c
index 91fa855e3300f5316d47d9a5f419244203a8195c..5a0c8db816d8194042ee3f2b667b9cafed8fb3d7 100644 (file)
--- a/drivers/net/skfp/smtdef.c
+++ b/drivers/net/skfp/smtdef.c
@@ -262,7 +262,7 @@ static void smt_init_mib(struct s_smc *smc, int level)
                 */
                /* Attention: don't initialize mib pointer here! */
                /*  It must be initialized during phase 2 */
-               smc->y[port].mib = 0 ;
+               smc->y[port].mib = NULL;
                mib->fddiSMTPORTIndexes[port] = port+INDEX_PORT ;
 
                pm->fddiPORTIndex = port+INDEX_PORT ;

diff --git a/drivers/net/skfp/smtparse.c b/drivers/net/skfp/smtparse.c
index 0be1158ab9a090a7a6dcf093bde7a4b148691b99..d5779e414dbe2392fc6dfec57bb24f82c5fd86ac 100644 (file)
--- a/drivers/net/skfp/smtparse.c
+++ b/drivers/net/skfp/smtparse.c
@@ -73,7 +73,7 @@ static struct s_ptab {
        { "SBACOMMAND",16,      0 } ,
        { "SBAAVAILABLE",17,    1,      0,      100     } ,
 #endif
-       { 0 }
+       { NULL }
 } ;
 
 /* Define maximum string size for values and keybuffer */

diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/skfp/smttimer.c
index a82649b3598da1cf5d6f0ba1ac0d9be251ef4525..531795e98c30d25f25c8f0c5c1aa0a259d67f5a7 100644 (file)
--- a/drivers/net/skfp/smttimer.c
+++ b/drivers/net/skfp/smttimer.c
@@ -30,9 +30,9 @@ static void timer_done(struct s_smc *smc, int restart);
 
 void smt_timer_init(struct s_smc *smc)
 {
-       smc->t.st_queue = 0 ;
+       smc->t.st_queue = NULL;
        smc->t.st_fast.tm_active = FALSE ;
-       smc->t.st_fast.tm_next = 0 ;
+       smc->t.st_fast.tm_next = NULL;
        hwt_init(smc) ;
 }
 
@@ -75,7 +75,7 @@ void smt_timer_start(struct s_smc *smc, struct smt_timer *timer, u_long time,
        timer->tm_active = TRUE ;
        if (!smc->t.st_queue) {
                smc->t.st_queue = timer ;
-               timer->tm_next = 0 ;
+               timer->tm_next = NULL;
                timer->tm_delta = time ;
                hwt_start(smc,time) ;
                return ;
@@ -141,7 +141,7 @@ static void timer_done(struct s_smc *smc, int restart)
                        done = 1 ;
                }
        }
-       *last = 0 ;
+       *last = NULL;
        next = smc->t.st_queue ;
        smc->t.st_queue = tm ;
 

diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index f5b380b95db63f44883fda7152ea929d2ddfb08a..16573aca8b6268dda579c96117439f3475fcda70 100644 (file)
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -167,7 +167,7 @@ static struct s_srf_evc *smt_get_evc(struct s_smc *smc, int code, int index)
                if (evc->evc_code == code && evc->evc_index == index)
                        return(evc) ;
        }
-       return(0) ;
+       return NULL;
 }
 
 #define THRESHOLD_2    (2*TICKS_PER_SECOND)