[SCSI] mpt fusion: mostly kmalloc + memset conversion to kzalloc
This patch does kmalloc + memset conversion to kzalloc anSigned-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> d simplifies mptctl_probe(). drivers/message/fusion/mptctl.c | 82092 -> 81884 (-208 bytes) drivers/message/fusion/mptctl.o | 201784 -> 200648 (-1136 bytes) Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Acked-by: "Moore, Eric Dean" <Eric.Moore@lsil.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
1d9a3d0651
commit
d7383a2346
|
@ -977,10 +977,9 @@ kbuf_alloc_2_sgl(int bytes, u32 sgdir, int sge_offset, int *frags,
|
||||||
* structures for the SG elements.
|
* structures for the SG elements.
|
||||||
*/
|
*/
|
||||||
i = MAX_SGL_BYTES / 8;
|
i = MAX_SGL_BYTES / 8;
|
||||||
buflist = kmalloc(i, GFP_USER);
|
buflist = kzalloc(i, GFP_USER);
|
||||||
if (buflist == NULL)
|
if (!buflist)
|
||||||
return NULL;
|
return NULL;
|
||||||
memset(buflist, 0, i);
|
|
||||||
buflist_ent = 0;
|
buflist_ent = 0;
|
||||||
|
|
||||||
/* Allocate a single block of memory to store the sg elements and
|
/* 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
|
* 15- 8: Bus Number
|
||||||
* 7- 0: Target ID
|
* 7- 0: Target ID
|
||||||
*/
|
*/
|
||||||
pmem = kmalloc(numBytes, GFP_KERNEL);
|
pmem = kzalloc(numBytes, GFP_KERNEL);
|
||||||
if (pmem == NULL) {
|
if (!pmem) {
|
||||||
printk(KERN_ERR "%s::mptctl_gettargetinfo() @%d - no memory available!\n",
|
printk(KERN_ERR "%s::mptctl_gettargetinfo() @%d - no memory available!\n",
|
||||||
__FILE__, __LINE__);
|
__FILE__, __LINE__);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
memset(pmem, 0, numBytes);
|
|
||||||
pdata = (int *) pmem;
|
pdata = (int *) pmem;
|
||||||
|
|
||||||
/* Get number of devices
|
/* Get number of devices
|
||||||
|
@ -1570,12 +1568,11 @@ mptctl_eventenable (unsigned long arg)
|
||||||
/* Have not yet allocated memory - do so now.
|
/* Have not yet allocated memory - do so now.
|
||||||
*/
|
*/
|
||||||
int sz = MPTCTL_EVENT_LOG_SIZE * sizeof(MPT_IOCTL_EVENTS);
|
int sz = MPTCTL_EVENT_LOG_SIZE * sizeof(MPT_IOCTL_EVENTS);
|
||||||
ioc->events = kmalloc(sz, GFP_KERNEL);
|
ioc->events = kzalloc(sz, GFP_KERNEL);
|
||||||
if (ioc->events == NULL) {
|
if (!ioc->events) {
|
||||||
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
|
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
memset(ioc->events, 0, sz);
|
|
||||||
ioc->alloc_total += sz;
|
ioc->alloc_total += sz;
|
||||||
|
|
||||||
ioc->eventContext = 0;
|
ioc->eventContext = 0;
|
||||||
|
@ -2865,31 +2862,22 @@ static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long a
|
||||||
static int
|
static int
|
||||||
mptctl_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
mptctl_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||||
{
|
{
|
||||||
int err;
|
MPT_IOCTL *mem;
|
||||||
int sz;
|
|
||||||
u8 *mem;
|
|
||||||
MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
|
MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate and inite a MPT_IOCTL structure
|
* Allocate and inite a MPT_IOCTL structure
|
||||||
*/
|
*/
|
||||||
sz = sizeof (MPT_IOCTL);
|
mem = kzalloc(sizeof(MPT_IOCTL), GFP_KERNEL);
|
||||||
mem = kmalloc(sz, GFP_KERNEL);
|
if (!mem) {
|
||||||
if (mem == NULL) {
|
mptctl_remove(pdev);
|
||||||
err = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto out_fail;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(mem, 0, sz);
|
ioc->ioctl = mem;
|
||||||
ioc->ioctl = (MPT_IOCTL *) mem;
|
|
||||||
ioc->ioctl->ioc = ioc;
|
ioc->ioctl->ioc = ioc;
|
||||||
mutex_init(&ioc->ioctl->ioctl_mutex);
|
mutex_init(&ioc->ioctl->ioctl_mutex);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_fail:
|
|
||||||
|
|
||||||
mptctl_remove(pdev);
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
|
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
|
||||||
|
|
Loading…
Reference in New Issue