diff options
26 files changed, 50 insertions, 54 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index 45492c1ad817..c496ebfc895d 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -1311,8 +1311,8 @@ dgrs_found_device( *privN = *priv; /* ... and zero out VM areas */ - privN->vmem = 0; - privN->vplxdma = 0; + privN->vmem = NULL; + privN->vplxdma = NULL; /* ... and zero out IRQ */ devN->irq = 0; /* ... and base MAC address off address of 1st port */ diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 31859c6bcf6d..ed15b19eb044 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -132,7 +132,7 @@ static struct { {"Holtek HT80232", ONLY_16BIT_IO | HOLTEK_FDX}, {"Holtek HT80229", ONLY_32BIT_IO | HOLTEK_FDX | STOP_PG_0x60 }, {"Winbond W89C940(misprogrammed)", 0}, - {0,} + {NULL,} }; diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index c57cb341f769..effbad31d11e 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c @@ -1839,7 +1839,7 @@ pcnet32_interrupt(int irq, void *dev_id, struct pt_regs * regs) pci_unmap_single(lp->pci_dev, lp->tx_dma_addr[entry], lp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE); dev_kfree_skb_irq(lp->tx_skbuff[entry]); - lp->tx_skbuff[entry] = 0; + lp->tx_skbuff[entry] = NULL; lp->tx_dma_addr[entry] = 0; } dirty_tx++; diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index de3a560f159d..059f1a68a75b 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c @@ -634,7 +634,7 @@ static int rr_init1(struct net_device *dev) for (i = 0; i < TX_RING_ENTRIES; i++) { rrpriv->tx_ring[i].size = 0; set_rraddr(&rrpriv->tx_ring[i].addr, 0); - rrpriv->tx_skbuff[i] = 0; + rrpriv->tx_skbuff[i] = NULL; } rrpriv->info->tx_ctrl.entry_size = sizeof(struct tx_desc); rrpriv->info->tx_ctrl.entries = TX_RING_ENTRIES; @@ -744,7 +744,7 @@ static int rr_init1(struct net_device *dev) rrpriv->rx_ring[i].size = 0; set_rraddr(&rrpriv->rx_ring[i].addr, 0); dev_kfree_skb(skb); - rrpriv->rx_skbuff[i] = 0; + rrpriv->rx_skbuff[i] = NULL; } } return ecode; diff --git a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c index 68117a41282a..4e462955ecd8 100644 --- a/drivers/net/sk98lin/sktimer.c +++ b/drivers/net/sk98lin/sktimer.c @@ -62,7 +62,7 @@ int Level) /* Init Level */ { switch (Level) { case SK_INIT_DATA: - pAC->Tim.StQueue = 0; + pAC->Tim.StQueue = NULL; break; case SK_INIT_IO: SkHwtInit(pAC, Ioc); @@ -145,7 +145,7 @@ SK_EVPARA Para) /* Event Parameter for this timer */ if (!pAC->Tim.StQueue) { /* First Timer to be started */ pAC->Tim.StQueue = pTimer; - pTimer->TmNext = 0; + pTimer->TmNext = NULL; pTimer->TmDelta = Time; SkHwtStart(pAC, Ioc, Time); @@ -228,7 +228,7 @@ int Restart) /* Do we need to restart the Hardware timer ? */ Done = 1; } } - *ppLast = 0; + *ppLast = NULL; /* * pTm points to the first Timer that did not run out. * StQueue points to the first Timer that run out. diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c index 83ac42c820a5..eb3c8988ced1 100644 --- a/drivers/net/sk98lin/skvpd.c +++ b/drivers/net/sk98lin/skvpd.c @@ -556,7 +556,7 @@ SK_VPD_PARA *p) /* parameter description struct */ if (*v != (char)RES_ID) { SK_DBG_MSG(pAC, SK_DBGMOD_VPD, SK_DBGCAT_ERR | SK_DBGCAT_FATAL, ("Error: 0x%x missing\n", RES_ID)); - return(0); + return NULL; } if (strcmp(key, VPD_NAME) == 0) { @@ -600,7 +600,7 @@ SK_VPD_PARA *p) /* parameter description struct */ ("Key/Len Encoding error\n")); } #endif /* DEBUG */ - return(0); + return NULL; } /* @@ -751,7 +751,7 @@ int op) /* operation to do: ADD_KEY or OWR_KEY */ vpd_size = pAC->vpd.vpd_size; rtv = 0; - ip = 0; + ip = NULL; if (type == VPD_RW_KEY) { /* end tag is "RW" */ free = pAC->vpd.v.vpd_free_rw; diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index e41cc71142c7..dcf7f3e8ce93 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c @@ -446,7 +446,7 @@ static int streamer_reset(struct net_device *dev) __u8 *streamer_mmio; unsigned long t; unsigned int uaa_addr; - struct sk_buff *skb = 0; + struct sk_buff *skb = NULL; __u16 misr; streamer_priv = (struct streamer_private *) dev->priv; diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index e8ff967b6d43..ea82d131a6c7 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -268,7 +268,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device char proc_name[20] ; strcpy(proc_name,"net/olympic_") ; strcat(proc_name,dev->name) ; - create_proc_read_entry(proc_name,0,0,olympic_proc_info,(void *)dev) ; + create_proc_read_entry(proc_name,0,NULL,olympic_proc_info,(void *)dev) ; printk("Olympic: Network Monitor information: /proc/%s\n",proc_name); } return 0 ; diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 6431b07be326..599057ac316f 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -4939,7 +4939,7 @@ static int smctr_send_rq_init(struct net_device *dev) tmf->dc_sc = DC_RPS | SC_RS; tmf->vl = 4; - smctr_make_8025_hdr(dev, 0L, tmf, AC_FC_RQ_INIT); + smctr_make_8025_hdr(dev, NULL, tmf, AC_FC_RQ_INIT); tsv = (MAC_SUB_VECTOR *)((__u32)tmf + sizeof(MAC_HEADER)); smctr_make_product_id(dev, tsv); diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index d59d46ecd2bf..962138008b85 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -4721,8 +4721,8 @@ type1_infoblock(struct net_device *dev, u_char count, u_char *p) if (lp->state == INITIALISED) { lp->ibn = 1; lp->active = *p++; - lp->phy[lp->active].gep = (*p ? p : 0); p += (*p + 1); - lp->phy[lp->active].rst = (*p ? p : 0); p += (*p + 1); + lp->phy[lp->active].gep = (*p ? p : NULL); p += (*p + 1); + lp->phy[lp->active].rst = (*p ? p : NULL); p += (*p + 1); lp->phy[lp->active].mc = TWIDDLE(p); p += 2; lp->phy[lp->active].ana = TWIDDLE(p); p += 2; lp->phy[lp->active].fdx = TWIDDLE(p); p += 2; @@ -4802,8 +4802,8 @@ type3_infoblock(struct net_device *dev, u_char count, u_char *p) lp->ibn = 3; lp->active = *p++; if (MOTO_SROM_BUG) lp->active = 0; - lp->phy[lp->active].gep = (*p ? p : 0); p += (2 * (*p) + 1); - lp->phy[lp->active].rst = (*p ? p : 0); p += (2 * (*p) + 1); + lp->phy[lp->active].gep = (*p ? p : NULL); p += (2 * (*p) + 1); + lp->phy[lp->active].rst = (*p ? p : NULL); p += (2 * (*p) + 1); lp->phy[lp->active].mc = TWIDDLE(p); p += 2; lp->phy[lp->active].ana = TWIDDLE(p); p += 2; lp->phy[lp->active].fdx = TWIDDLE(p); p += 2; diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c index b266bfec322f..512debab8b4e 100644 --- a/drivers/net/tulip/eeprom.c +++ b/drivers/net/tulip/eeprom.c @@ -62,7 +62,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = { */ { 0x1e00, 0x0000, 0x000b, 0x8f01, 0x0103, 0x0300, 0x0821, 0x000, 0x0001, 0x0000, 0x01e1 } }, - {0, 0, 0, 0, {}}}; + {NULL}}; static const char *block_name[] __devinitdata = { @@ -136,7 +136,7 @@ void __devinit tulip_parse_eeprom(struct net_device *dev) unsigned char *ee_data = tp->eeprom; int i; - tp->mtable = 0; + tp->mtable = NULL; /* Detect an old-style (SA only) EEPROM layout: memcmp(eedata, eedata+16, 8). */ for (i = 0; i < 8; i ++) diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 22d57c86a36d..d3efcadca48c 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -251,7 +251,7 @@ static struct pci_id_info pci_id_tbl[] = { W840_FLAGS, 128, CanHaveMII | HasBrokenTx}, {"Compex RL100-ATX", { 0x201111F6, 0xffffffff,}, W840_FLAGS, 128, CanHaveMII | HasBrokenTx}, - {0,}, /* 0 terminated list. */ + {NULL,}, /* 0 terminated list. */ }; /* This driver was written to use PCI memory space, however some x86 systems @@ -851,7 +851,7 @@ static void init_rxtx_rings(struct net_device *dev) for (i = 0; i < RX_RING_SIZE; i++) { np->rx_ring[i].length = np->rx_buf_sz; np->rx_ring[i].status = 0; - np->rx_skbuff[i] = 0; + np->rx_skbuff[i] = NULL; } /* Mark the last entry as wrapping the ring. */ np->rx_ring[i-1].length |= DescEndRing; @@ -875,7 +875,7 @@ static void init_rxtx_rings(struct net_device *dev) /* Initialize the Tx descriptors */ for (i = 0; i < TX_RING_SIZE; i++) { - np->tx_skbuff[i] = 0; + np->tx_skbuff[i] = NULL; np->tx_ring[i].status = 0; } np->tx_full = 0; @@ -900,7 +900,7 @@ static void free_rxtx_rings(struct netdev_private* np) PCI_DMA_FROMDEVICE); dev_kfree_skb(np->rx_skbuff[i]); } - np->rx_skbuff[i] = 0; + np->rx_skbuff[i] = NULL; } for (i = 0; i < TX_RING_SIZE; i++) { if (np->tx_skbuff[i]) { @@ -910,7 +910,7 @@ static void free_rxtx_rings(struct netdev_private* np) PCI_DMA_TODEVICE); dev_kfree_skb(np->tx_skbuff[i]); } - np->tx_skbuff[i] = 0; + np->tx_skbuff[i] = NULL; } } @@ -1145,7 +1145,7 @@ static void netdev_tx_done(struct net_device *dev) PCI_DMA_TODEVICE); np->tx_q_bytes -= np->tx_skbuff[entry]->len; dev_kfree_skb_irq(np->tx_skbuff[entry]); - np->tx_skbuff[entry] = 0; + np->tx_skbuff[entry] = NULL; } if (np->tx_full && np->cur_tx - np->dirty_tx < TX_QUEUE_LEN_RESTART && diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 332202ba0efa..b9800715d739 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -1250,7 +1250,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/ for (i = 0; i < LMC_RXDESCS; i++) { struct sk_buff *skb = sc->lmc_rxq[i]; - sc->lmc_rxq[i] = 0; + sc->lmc_rxq[i] = NULL; sc->lmc_rxring[i].status = 0; sc->lmc_rxring[i].length = 0; sc->lmc_rxring[i].buffer1 = 0xDEADBEEF; @@ -1394,7 +1394,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r // dev_kfree_skb(sc->lmc_txq[i]); dev_kfree_skb_irq(sc->lmc_txq[i]); - sc->lmc_txq[i] = 0; + sc->lmc_txq[i] = NULL; badtx++; i = badtx % LMC_TXDESCS; @@ -1667,7 +1667,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/ */ give_it_anyways: - sc->lmc_rxq[i] = 0x0; + sc->lmc_rxq[i] = NULL; sc->lmc_rxring[i].buffer1 = 0x0; skb_put (skb, len); @@ -1965,7 +1965,7 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/ dev_kfree_skb(sc->lmc_txq[i]); /* free it */ sc->stats.tx_dropped++; /* We just dropped a packet */ } - sc->lmc_txq[i] = 0; + sc->lmc_txq[i] = NULL; sc->lmc_txring[i].status = 0x00000000; sc->lmc_txring[i].buffer2 = virt_to_bus (&sc->lmc_txring[i + 1]); } diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index de2e2258c246..bb9f1eab7cdb 100644 --- a/drivers/net/wan/lmc/lmc_proto.c +++ b/drivers/net/wan/lmc/lmc_proto.c @@ -112,7 +112,7 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/ * They set a few basics because they don't use sync_ppp */ dev->flags |= IFF_POINTOPOINT; - dev->hard_header = 0; + dev->hard_header = NULL; dev->hard_header_len = 0; dev->addr_len = 0; } diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index d8e3f537c3ca..79d6894acd1f 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c @@ -264,7 +264,7 @@ void cpc_tty_init(pc300dev_t *pc300dev) INIT_WORK(&cpc_tty->tty_tx_work, cpc_tty_tx_work, (void *)cpc_tty); INIT_WORK(&cpc_tty->tty_rx_work, cpc_tty_rx_work, (void *)port); - cpc_tty->buf_rx.first = cpc_tty->buf_rx.last = 0; + cpc_tty->buf_rx.first = cpc_tty->buf_rx.last = NULL; pc300dev->cpc_tty = (void *)cpc_tty; @@ -878,7 +878,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev) cpc_tty_trace(pc300dev, new->data,rx_len, 'R'); } new->size = rx_len; - new->next = 0; + new->next = NULL; if (cpc_tty->buf_rx.first == 0) { cpc_tty->buf_rx.first = new; cpc_tty->buf_rx.last = new; diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 311ac346fb3e..d0dd89745361 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -349,7 +349,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) if( sbni_card_probe( ioaddr ) ) { release_region( ioaddr, SBNI_IO_EXTENT ); - return 0; + return NULL; } outb( 0, ioaddr + CSR0 ); @@ -368,7 +368,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) printk( KERN_ERR "%s: can't detect device irq!\n", dev->name ); release_region( ioaddr, SBNI_IO_EXTENT ); - return 0; + return NULL; } } else if( irq == 2 ) irq = 9; @@ -381,7 +381,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) if( !nl ) { printk( KERN_ERR "%s: unable to get memory!\n", dev->name ); release_region( ioaddr, SBNI_IO_EXTENT ); - return 0; + return NULL; } dev->priv = nl; diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 8cceec11df55..f7442d52dabe 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c @@ -643,7 +643,7 @@ badreq: case LCP_TERM_REQ: sppp_clear_timeout (sp); /* Send Terminate-Ack packet. */ - sppp_cp_send (sp, PPP_LCP, LCP_TERM_ACK, h->ident, 0, 0); + sppp_cp_send (sp, PPP_LCP, LCP_TERM_ACK, h->ident, 0, NULL); /* Go to closed state. */ sp->lcp.state = LCP_STATE_CLOSED; sp->ipcp.state = IPCP_STATE_CLOSED; @@ -1262,7 +1262,7 @@ static void sppp_ipcp_input (struct sppp *sp, struct sk_buff *skb) } else { /* Send Configure-Ack packet. */ sppp_cp_send (sp, PPP_IPCP, IPCP_CONF_ACK, h->ident, - 0, 0); + 0, NULL); /* Change the state. */ if (sp->ipcp.state == IPCP_STATE_ACK_RCVD) sp->ipcp.state = IPCP_STATE_OPENED; @@ -1297,7 +1297,7 @@ static void sppp_ipcp_input (struct sppp *sp, struct sk_buff *skb) break; case IPCP_TERM_REQ: /* Send Terminate-Ack packet. */ - sppp_cp_send (sp, PPP_IPCP, IPCP_TERM_ACK, h->ident, 0, 0); + sppp_cp_send (sp, PPP_IPCP, IPCP_TERM_ACK, h->ident, 0, NULL); /* Go to closed state. */ sp->ipcp.state = IPCP_STATE_CLOSED; /* Initiate renegotiation. */ @@ -1332,7 +1332,7 @@ static void sppp_lcp_open (struct sppp *sp) static void sppp_ipcp_open (struct sppp *sp) { sp->ipcp.confid = ++sp->pp_seq; - sppp_cp_send (sp, PPP_IPCP, IPCP_CONF_REQ, sp->ipcp.confid, 0, 0); + sppp_cp_send (sp, PPP_IPCP, IPCP_CONF_REQ, sp->ipcp.confid, 0, NULL); sppp_set_timeout (sp, 2); } diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 9fb04ca14cb5..467ad7b8cd86 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -627,7 +627,7 @@ static void x25_asy_close_tty(struct tty_struct *tty) (void) dev_close(sl->dev); } - tty->disc_data = 0; + tty->disc_data = NULL; sl->tty = NULL; x25_asy_free(sl); } diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 302654d7fb71..9cfe158f0269 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -101,7 +101,7 @@ static struct pci_driver airo_driver = { infront of the label, that statistic will not be included in the list of statistics in the /proc filesystem */ -#define IGNLABEL(comment) 0 +#define IGNLABEL(comment) NULL static char *statsLabels[] = { "RxOverrun", IGNLABEL("RxPlcpCrcErr"), @@ -2346,7 +2346,7 @@ void stop_airo_card( struct net_device *dev, int freeres ) if (ai->wifidev) { unregister_netdev(ai->wifidev); free_netdev(ai->wifidev); - ai->wifidev = 0; + ai->wifidev = NULL; } clear_bit(FLAG_REGISTERED, &ai->flags); } @@ -2358,7 +2358,7 @@ void stop_airo_card( struct net_device *dev, int freeres ) * Clean out tx queue */ if (test_bit(FLAG_MPI, &ai->flags) && skb_queue_len (&ai->txq) > 0) { - struct sk_buff *skb = 0; + struct sk_buff *skb = NULL; for (;(skb = skb_dequeue(&ai->txq));) dev_kfree_skb(skb); } diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 0c26c81242f6..6f3d7c25ab74 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c @@ -270,7 +270,7 @@ static void airo_detach(dev_link_t *link) if ( ((local_info_t*)link->priv)->eth_dev ) { stop_airo_card( ((local_info_t*)link->priv)->eth_dev, 0 ); } - ((local_info_t*)link->priv)->eth_dev = 0; + ((local_info_t*)link->priv)->eth_dev = NULL; /* Break the link with Card Services */ if (link->handle) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 6f6082d053ad..2da0102a750a 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -1599,7 +1599,7 @@ struct net_device *init_atmel_card( unsigned short irq, int port, char *firmware netif_carrier_off(dev); - create_proc_read_entry ("driver/atmel", 0, 0, atmel_read_proc, priv); + create_proc_read_entry ("driver/atmel", 0, NULL, atmel_read_proc, priv); printk(KERN_INFO "%s: Atmel at76c50x wireless. Version %d.%d simon@thekelleys.org.uk\n", dev->name, DRIVER_MAJOR, DRIVER_MINOR); diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index cccec2b32049..c3c561fd9f6e 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c @@ -612,7 +612,7 @@ static void atmel_release(dev_link_t *link) if (dev) stop_atmel_card(dev, 0); - ((local_info_t*)link->priv)->eth_dev = 0; + ((local_info_t*)link->priv)->eth_dev = NULL; /* Don't bother checking to see if these succeed or not */ pcmcia_release_configuration(link->handle); diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c index 2eedd2d0f839..b5660defd855 100644 --- a/drivers/net/wireless/orinoco_plx.c +++ b/drivers/net/wireless/orinoco_plx.c @@ -324,8 +324,6 @@ static struct pci_driver orinoco_plx_driver = { .id_table = orinoco_plx_pci_id_table, .probe = orinoco_plx_init_one, .remove = __devexit_p(orinoco_plx_remove_one), - .suspend = 0, - .resume = 0, }; static char version[] __initdata = "orinoco_plx.c 0.13e (Daniel Barlow <dan@telent.net>, David Gibson <hermes@gibson.dropbear.id.au>)"; diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c index d234cc5a438c..56ab51cf553d 100644 --- a/drivers/net/wireless/orinoco_tmd.c +++ b/drivers/net/wireless/orinoco_tmd.c @@ -202,8 +202,6 @@ static struct pci_driver orinoco_tmd_driver = { .id_table = orinoco_tmd_pci_id_table, .probe = orinoco_tmd_init_one, .remove = __devexit_p(orinoco_tmd_remove_one), - .suspend = 0, - .resume = 0, }; static char version[] __initdata = "orinoco_tmd.c 0.01 (Joerg Dorchain <joerg@dorchain.net>)"; diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index ca8e54d57209..e39bcddc30a3 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -2914,7 +2914,7 @@ static int __init init_ray_cs(void) DEBUG(1, "raylink init_module register_pcmcia_driver returns 0x%x\n",rc); #ifdef CONFIG_PROC_FS - proc_mkdir("driver/ray_cs", 0); + proc_mkdir("driver/ray_cs", NULL); create_proc_info_entry("driver/ray_cs/ray_cs", 0, NULL, &ray_cs_proc_read); raycs_write("driver/ray_cs/essid", write_essid, NULL); diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index a26e6590fa38..98cee21f7d84 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c @@ -2707,7 +2707,7 @@ static void strip_close(struct tty_struct *tty) unregister_netdev(strip_info->dev); - tty->disc_data = 0; + tty->disc_data = NULL; strip_info->tty = NULL; printk(KERN_INFO "STRIP: device \"%s\" closed down\n", strip_info->dev->name); |