please consider for 2.6.17 tree -- thanks! [ATM]: [drivers] kzalloc() conversion in drivers/atm
Signed-off-by: Eric Sesterhenn <[EMAIL PROTECTED]> Signed-off-by: Chas Williams <[EMAIL PROTECTED]> --- commit b8fc35b0d286fd1c7d0ef4f31508d05ead85a35e tree 9f8dafc67c191c97df4e1f787709053cb4083495 parent 072ab3c1dc3a841129d7b9affee95ced61d5f3d8 author chas williams <[EMAIL PROTECTED](none)> Thu, 02 Mar 2006 12:45:27 -0500 committer chas williams <[EMAIL PROTECTED](none)> Thu, 02 Mar 2006 12:45:27 -0500 drivers/atm/adummy.c | 5 ++--- drivers/atm/firestream.c | 10 +++------- drivers/atm/he.c | 3 +-- drivers/atm/idt77252.c | 18 ++++++------------ drivers/atm/iphase.c | 6 ++---- drivers/atm/zatm.c | 12 ++++++------ 6 files changed, 20 insertions(+), 34 deletions(-) diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c @@ -114,14 +114,13 @@ static int __init adummy_init(void) printk(KERN_ERR "adummy: version %s\n", DRV_VERSION); - adummy_dev = (struct adummy_dev *) kmalloc(sizeof(struct adummy_dev), + adummy_dev = (struct adummy_dev *) kzalloc(sizeof(struct adummy_dev), GFP_KERNEL); if (!adummy_dev) { - printk(KERN_ERR DEV_LABEL ": kmalloc() failed\n"); + printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n"); err = -ENOMEM; goto out; } - memset(adummy_dev, 0, sizeof(struct adummy_dev)); atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL); if (!atm_dev) { diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -1782,7 +1782,7 @@ static int __devinit fs_init (struct fs_ write_fs (dev, RAM, (1 << (28 - FS155_VPI_BITS - FS155_VCI_BITS)) - 1); dev->nchannels = FS155_NR_CHANNELS; } - dev->atm_vccs = kmalloc (dev->nchannels * sizeof (struct atm_vcc *), + dev->atm_vccs = kcalloc(dev->nchannels, sizeof (struct atm_vcc *), GFP_KERNEL); fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n", dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *)); @@ -1792,9 +1792,8 @@ static int __devinit fs_init (struct fs_ /* XXX Clean up..... */ return 1; } - memset (dev->atm_vccs, 0, dev->nchannels * sizeof (struct atm_vcc *)); - dev->tx_inuse = kmalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL); + dev->tx_inuse = kzalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL); fs_dprintk (FS_DEBUG_ALLOC, "Alloc tx_inuse: %p(%d)\n", dev->atm_vccs, dev->nchannels / 8); @@ -1803,7 +1802,6 @@ static int __devinit fs_init (struct fs_ /* XXX Clean up..... */ return 1; } - memset (dev->tx_inuse, 0, dev->nchannels / 8); /* -- RAS1 : FS155 and 50 differ. Default (0) should be OK for both */ /* -- RAS2 : FS50 only: Default is OK. */ @@ -1891,14 +1889,12 @@ static int __devinit firestream_init_one if (pci_enable_device(pci_dev)) goto err_out; - fs_dev = kmalloc (sizeof (struct fs_dev), GFP_KERNEL); + fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL); fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n", fs_dev, sizeof (struct fs_dev)); if (!fs_dev) goto err_out; - memset (fs_dev, 0, sizeof (struct fs_dev)); - atm_dev = atm_dev_register("fs", &ops, -1, NULL); if (!atm_dev) goto err_out_free_fs_dev; diff --git a/drivers/atm/he.c b/drivers/atm/he.c --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -384,13 +384,12 @@ he_init_one(struct pci_dev *pci_dev, con } pci_set_drvdata(pci_dev, atm_dev); - he_dev = (struct he_dev *) kmalloc(sizeof(struct he_dev), + he_dev = (struct he_dev *) kzalloc(sizeof(struct he_dev), GFP_KERNEL); if (!he_dev) { err = -ENOMEM; goto init_one_failure; } - memset(he_dev, 0, sizeof(struct he_dev)); he_dev->pci_dev = pci_dev; he_dev->atm_dev = atm_dev; diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -642,10 +642,9 @@ alloc_scq(struct idt77252_dev *card, int { struct scq_info *scq; - scq = (struct scq_info *) kmalloc(sizeof(struct scq_info), GFP_KERNEL); + scq = (struct scq_info *) kzalloc(sizeof(struct scq_info), GFP_KERNEL); if (!scq) return NULL; - memset(scq, 0, sizeof(struct scq_info)); scq->base = pci_alloc_consistent(card->pcidev, SCQ_SIZE, &scq->paddr); @@ -2142,10 +2141,9 @@ idt77252_init_est(struct vc_map *vc, int { struct rate_estimator *est; - est = kmalloc(sizeof(struct rate_estimator), GFP_KERNEL); + est = kzalloc(sizeof(struct rate_estimator), GFP_KERNEL); if (!est) return NULL; - memset(est, 0, sizeof(*est)); est->maxcps = pcr < 0 ? -pcr : pcr; est->cps = est->maxcps; @@ -2451,13 +2449,12 @@ idt77252_open(struct atm_vcc *vcc) index = VPCI2VC(card, vpi, vci); if (!card->vcs[index]) { - card->vcs[index] = kmalloc(sizeof(struct vc_map), GFP_KERNEL); + card->vcs[index] = kzalloc(sizeof(struct vc_map), GFP_KERNEL); if (!card->vcs[index]) { printk("%s: can't alloc vc in open()\n", card->name); up(&card->mutex); return -ENOMEM; } - memset(card->vcs[index], 0, sizeof(struct vc_map)); card->vcs[index]->card = card; card->vcs[index]->index = index; @@ -2926,12 +2923,11 @@ open_card_oam(struct idt77252_dev *card) for (vci = 3; vci < 5; vci++) { index = VPCI2VC(card, vpi, vci); - vc = kmalloc(sizeof(struct vc_map), GFP_KERNEL); + vc = kzalloc(sizeof(struct vc_map), GFP_KERNEL); if (!vc) { printk("%s: can't alloc vc\n", card->name); return -ENOMEM; } - memset(vc, 0, sizeof(struct vc_map)); vc->index = index; card->vcs[index] = vc; @@ -2995,12 +2991,11 @@ open_card_ubr0(struct idt77252_dev *card { struct vc_map *vc; - vc = kmalloc(sizeof(struct vc_map), GFP_KERNEL); + vc = kzalloc(sizeof(struct vc_map), GFP_KERNEL); if (!vc) { printk("%s: can't alloc vc\n", card->name); return -ENOMEM; } - memset(vc, 0, sizeof(struct vc_map)); card->vcs[0] = vc; vc->class = SCHED_UBR0; @@ -3695,13 +3690,12 @@ idt77252_init_one(struct pci_dev *pcidev goto err_out_disable_pdev; } - card = kmalloc(sizeof(struct idt77252_dev), GFP_KERNEL); + card = kzalloc(sizeof(struct idt77252_dev), GFP_KERNEL); if (!card) { printk("idt77252-%d: can't allocate private data\n", index); err = -ENOMEM; goto err_out_disable_pdev; } - memset(card, 0, sizeof(struct idt77252_dev)); card->revision = revision; card->index = index; diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -1601,14 +1601,13 @@ static int rx_init(struct atm_dev *dev) skb_queue_head_init(&iadev->rx_dma_q); iadev->rx_free_desc_qhead = NULL; - iadev->rx_open = kmalloc(4*iadev->num_vc,GFP_KERNEL); + iadev->rx_open = kzalloc(4*iadev->num_vc,GFP_KERNEL); if (!iadev->rx_open) { printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n", dev->number); goto err_free_dle; } - memset(iadev->rx_open, 0, 4*iadev->num_vc); iadev->rxing = 1; iadev->rx_pkt_cnt = 0; /* Mode Register */ @@ -3174,12 +3173,11 @@ static int __devinit ia_init_one(struct unsigned long flags; int ret; - iadev = kmalloc(sizeof(*iadev), GFP_KERNEL); + iadev = kzalloc(sizeof(*iadev), GFP_KERNEL); if (!iadev) { ret = -ENOMEM; goto err_out; } - memset(iadev, 0, sizeof(*iadev)); iadev->pci = pdev; IF_INIT(printk("ia detected at bus:%d dev: %d function:%d\n", diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -604,9 +604,9 @@ static int start_rx(struct atm_dev *dev) DPRINTK("start_rx\n"); zatm_dev = ZATM_DEV(dev); size = sizeof(struct atm_vcc *)*zatm_dev->chans; - zatm_dev->rx_map = (struct atm_vcc **) kmalloc(size,GFP_KERNEL); - if (!zatm_dev->rx_map) return -ENOMEM; - memset(zatm_dev->rx_map,0,size); + zatm_dev->rx_map = (struct atm_vcc **) kzalloc(size, GFP_KERNEL); + if (!zatm_dev->rx_map) + return -ENOMEM; /* set VPI/VCI split (use all VCIs and give what's left to VPIs) */ zpokel(zatm_dev,(1 << dev->ci_range.vci_bits)-1,uPD98401_VRR); /* prepare free buffer pools */ @@ -952,9 +952,9 @@ static int open_tx_first(struct atm_vcc skb_queue_head_init(&zatm_vcc->tx_queue); init_waitqueue_head(&zatm_vcc->tx_wait); /* initialize ring */ - zatm_vcc->ring = kmalloc(RING_SIZE,GFP_KERNEL); - if (!zatm_vcc->ring) return -ENOMEM; - memset(zatm_vcc->ring,0,RING_SIZE); + zatm_vcc->ring = kzalloc(RING_SIZE, GFP_KERNEL); + if (!zatm_vcc->ring) + return -ENOMEM; loop = zatm_vcc->ring+RING_ENTRIES*RING_WORDS; loop[0] = uPD98401_TXPD_V; loop[1] = loop[2] = 0; - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html