[SCSI] mpt fusion: mostly kmalloc + memset conversion to kzalloc (d7383a23) · Commits · 戴 / test

drivers/message/fusion/mptctl.c

+12 −24

Original line number	Diff line number	Diff line
		@@ -977,10 +977,9 @@ kbuf_alloc_2_sgl(int bytes, u32 sgdir, int sge_offset, int *frags,
		* structures for the SG elements.
		*/
		i = MAX_SGL_BYTES / 8;
		buflist = kmalloc(i, GFP_USER);
		if (buflist == NULL)
		buflist = kzalloc(i, GFP_USER);
		if (!buflist)
		return NULL;
		memset(buflist, 0, i);
		buflist_ent = 0;

		/* Allocate a single block of memory to store the sg elements and
		@@ -1379,13 +1378,12 @@ mptctl_gettargetinfo (unsigned long arg)
		* 15- 8: Bus Number
		* 7- 0: Target ID
		*/
		pmem = kmalloc(numBytes, GFP_KERNEL);
		if (pmem == NULL) {
		pmem = kzalloc(numBytes, GFP_KERNEL);
		if (!pmem) {
		printk(KERN_ERR "%s::mptctl_gettargetinfo() @%d - no memory available!\n",
		__FILE__, __LINE__);
		return -ENOMEM;
		}
		memset(pmem, 0, numBytes);
		pdata = (int *) pmem;

		/* Get number of devices
		@@ -1570,12 +1568,11 @@ mptctl_eventenable (unsigned long arg)
		/* Have not yet allocated memory - do so now.
		*/
		int sz = MPTCTL_EVENT_LOG_SIZE * sizeof(MPT_IOCTL_EVENTS);
		ioc->events = kmalloc(sz, GFP_KERNEL);
		if (ioc->events == NULL) {
		ioc->events = kzalloc(sz, GFP_KERNEL);
		if (!ioc->events) {
		printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
		return -ENOMEM;
		}
		memset(ioc->events, 0, sz);
		ioc->alloc_total += sz;

		ioc->eventContext = 0;
		@@ -2865,31 +2862,22 @@ static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long a
		static int
		mptctl_probe(struct pci_dev pdev, const struct pci_device_id id)
		{
		int err;
		int sz;
		u8 *mem;
		MPT_IOCTL *mem;
		MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

		/*
		* Allocate and inite a MPT_IOCTL structure
		*/
		sz = sizeof (MPT_IOCTL);
		mem = kmalloc(sz, GFP_KERNEL);
		if (mem == NULL) {
		err = -ENOMEM;
		goto out_fail;
		mem = kzalloc(sizeof(MPT_IOCTL), GFP_KERNEL);
		if (!mem) {
		mptctl_remove(pdev);
		return -ENOMEM;
		}

		memset(mem, 0, sz);
		ioc->ioctl = (MPT_IOCTL *) mem;
		ioc->ioctl = mem;
		ioc->ioctl->ioc = ioc;
		mutex_init(&ioc->ioctl->ioctl_mutex);
		return 0;

		out_fail:

		mptctl_remove(pdev);
		return err;
		}

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/

Admin message