Commit 41f96935 authored by Burman Yan's avatar Burman Yan Committed by Linus Torvalds
Browse files

[PATCH] isdn: replace kmalloc+memset with kzalloc 



Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0b2dd130

drivers/isdn/act2000/module.c

+1 −2
Original line number Diff line number Diff line
@@ -573,12 +573,11 @@ act2000_alloccard(int bus, int port, int irq, char *id) 
{

	int i;

        act2000_card *card;

        if (!(card = (act2000_card *) kmalloc(sizeof(act2000_card), GFP_KERNEL))) {

        if (!(card = kzalloc(sizeof(act2000_card), GFP_KERNEL))) {

                printk(KERN_WARNING

		       "act2000: (%s) Could not allocate card-struct.\n", id);

                return;

        }

        memset((char *) card, 0, sizeof(act2000_card));

        spin_lock_init(&card->lock);

        spin_lock_init(&card->mnlock);

	skb_queue_head_init(&card->sndq);

drivers/isdn/capi/capi.c

+3 −6
Original line number Diff line number Diff line
@@ -215,13 +215,12 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci) 
	unsigned int minor = 0;

	unsigned long flags;



	mp = kmalloc(sizeof(*mp), GFP_ATOMIC);

	mp = kzalloc(sizeof(*mp), GFP_ATOMIC);

  	if (!mp) {

  		printk(KERN_ERR "capi: can't alloc capiminor\n");

		return NULL;

	}



	memset(mp, 0, sizeof(struct capiminor));

	mp->ap = ap;

	mp->ncci = ncci;

	mp->msgid = 0;
@@ -304,10 +303,9 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) 
	struct capiminor *mp = NULL;

#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */



	np = kmalloc(sizeof(*np), GFP_ATOMIC);

	np = kzalloc(sizeof(*np), GFP_ATOMIC);

	if (!np)

		return NULL;

	memset(np, 0, sizeof(struct capincci));

	np->ncci = ncci;

	np->cdev = cdev;

#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -384,10 +382,9 @@ static struct capidev *capidev_alloc(void) 
	struct capidev *cdev;

	unsigned long flags;



	cdev = kmalloc(sizeof(*cdev), GFP_KERNEL);

	cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);

	if (!cdev)

		return NULL;

	memset(cdev, 0, sizeof(struct capidev));



	init_MUTEX(&cdev->ncci_list_sem);

	skb_queue_head_init(&cdev->recvqueue);

drivers/isdn/capi/capidrv.c

+3 −6
Original line number Diff line number Diff line
@@ -334,12 +334,11 @@ static capidrv_plci *new_plci(capidrv_contr * card, int chan) 
{

	capidrv_plci *plcip;



	plcip = (capidrv_plci *) kmalloc(sizeof(capidrv_plci), GFP_ATOMIC);

	plcip = kzalloc(sizeof(capidrv_plci), GFP_ATOMIC);



	if (plcip == 0)

		return NULL;



	memset(plcip, 0, sizeof(capidrv_plci));

	plcip->state = ST_PLCI_NONE;

	plcip->plci = 0;

	plcip->msgid = 0;
@@ -404,12 +403,11 @@ static inline capidrv_ncci *new_ncci(capidrv_contr * card, 
{

	capidrv_ncci *nccip;



	nccip = (capidrv_ncci *) kmalloc(sizeof(capidrv_ncci), GFP_ATOMIC);

	nccip = kzalloc(sizeof(capidrv_ncci), GFP_ATOMIC);



	if (nccip == 0)

		return NULL;



	memset(nccip, 0, sizeof(capidrv_ncci));

	nccip->ncci = ncci;

	nccip->state = ST_NCCI_NONE;

	nccip->plcip = plcip;
@@ -2005,12 +2003,11 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) 
		printk(KERN_WARNING "capidrv: (%s) Could not reserve module\n", id);

		return -1;

	}

	if (!(card = (capidrv_contr *) kmalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {

	if (!(card = kzalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {

		printk(KERN_WARNING

		 "capidrv: (%s) Could not allocate contr-struct.\n", id);

		return -1;

	}

	memset(card, 0, sizeof(capidrv_contr));

	card->owner = THIS_MODULE;

	init_timer(&card->listentimer);

	strcpy(card->name, id);

drivers/isdn/hardware/avm/avm_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -121,10 +121,9 @@ static int avmcs_probe(struct pcmcia_device *p_dev) 
    p_dev->conf.Present = PRESENT_OPTION;



    /* Allocate space for private device-specific data */

    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);

    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);

    if (!local)

        goto err;

    memset(local, 0, sizeof(local_info_t));

    p_dev->priv = local;



    return avmcs_config(p_dev);

drivers/isdn/hardware/avm/b1.c

+3 −7
Original line number Diff line number Diff line
@@ -65,18 +65,15 @@ avmcard *b1_alloc_card(int nr_controllers) 
	avmctrl_info *cinfo;

	int i;



	card = kmalloc(sizeof(*card), GFP_KERNEL);

	card = kzalloc(sizeof(*card), GFP_KERNEL);

	if (!card)

		return NULL;



	memset(card, 0, sizeof(*card));



        cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);

	cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);

	if (!cinfo) {

		kfree(card);

		return NULL;

	}

	memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);



	card->ctrlinfo = cinfo;

	for (i = 0; i < nr_controllers; i++) {
@@ -718,12 +715,11 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize) 
	avmcard_dmainfo *p;

	void *buf;



	p = kmalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);

	p = kzalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);

	if (!p) {

		printk(KERN_WARNING "%s: no memory.\n", name);

		goto err;

	}

	memset(p, 0, sizeof(avmcard_dmainfo));



	p->recvbuf.size = rsize;

	buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);