Commit 0c1cca1d authored by Om Narasimhan's avatar Om Narasimhan Committed by David S. Miller
Browse files

[ATM]: kmalloc to kzalloc patches for drivers/atm 



Signed-off-by: default avatarOm Narasimhan <om.turyx@gmail.com>
Signed-off-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 617dbeaa

drivers/atm/adummy.c

+2 −4
Original line number Diff line number Diff line
@@ -113,15 +113,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 = 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) {

		printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");

drivers/atm/firestream.c

+3 −9
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
		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 *));
@@ -1794,9 +1794,8 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* 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);
@@ -1805,8 +1804,6 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* 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. */
@@ -1893,14 +1890,11 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev, 
	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;

drivers/atm/he.c

+1 −3
Original line number Diff line number Diff line
@@ -383,14 +383,12 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) 
	}

	pci_set_drvdata(pci_dev, atm_dev);



	he_dev = (struct he_dev *) kmalloc(sizeof(struct he_dev),

	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;

	he_dev->atm_dev->dev_data = he_dev;

drivers/atm/horizon.c

+1 −3
Original line number Diff line number Diff line
@@ -2719,7 +2719,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ 
		goto out_disable;

	}



	dev = kmalloc(sizeof(hrz_dev), GFP_KERNEL);

	dev = kzalloc(sizeof(hrz_dev), GFP_KERNEL);

	if (!dev) {

		// perhaps we should be nice: deregister all adapters and abort?

		PRINTD(DBG_ERR, "out of memory");
@@ -2727,8 +2727,6 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ 
		goto out_release;

	}



	memset(dev, 0, sizeof(hrz_dev));



	pci_set_drvdata(pci_dev, dev);



	// grab IRQ and install handler - move this someplace more sensible

drivers/atm/idt77252.c

+6 −17
Original line number Diff line number Diff line
@@ -642,11 +642,9 @@ alloc_scq(struct idt77252_dev *card, int class) 
{

	struct scq_info *scq;



	scq = (struct scq_info *) kmalloc(sizeof(struct scq_info), GFP_KERNEL);

	scq = 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);

	if (scq->base == NULL) {
@@ -2142,11 +2140,9 @@ idt77252_init_est(struct vc_map *vc, int pcr) 
{

	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;

	est->avcps = est->cps << 5;
@@ -2451,14 +2447,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,13 +2920,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 +2987,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,14 +3686,12 @@ idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) 
		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;

	card->pcidev = pcidev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE