scsi: use pci_zalloc_consistent
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <joe@perches.com> Cc: Adam Radford <linuxraid@lsi.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Cc: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> Cc: Dario Ballabio <ballabio_dario@emc.com> Cc: Michael Neuffer <mike@i-Connect.Net> Cc: "Stephen M. Cameron" <scameron@beardog.cce.hp.com> Cc: Neela Syam Kolli <megaraidlinux@lsi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
8ac41b9dc7
commit
7c845eb5e1
@@ -4732,23 +4732,21 @@ static struct CommandList *cmd_special_alloc(struct ctlr_info *h)
|
||||
union u64bit temp64;
|
||||
dma_addr_t cmd_dma_handle, err_dma_handle;
|
||||
|
||||
c = pci_alloc_consistent(h->pdev, sizeof(*c), &cmd_dma_handle);
|
||||
c = pci_zalloc_consistent(h->pdev, sizeof(*c), &cmd_dma_handle);
|
||||
if (c == NULL)
|
||||
return NULL;
|
||||
memset(c, 0, sizeof(*c));
|
||||
|
||||
c->cmd_type = CMD_SCSI;
|
||||
c->cmdindex = -1;
|
||||
|
||||
c->err_info = pci_alloc_consistent(h->pdev, sizeof(*c->err_info),
|
||||
&err_dma_handle);
|
||||
c->err_info = pci_zalloc_consistent(h->pdev, sizeof(*c->err_info),
|
||||
&err_dma_handle);
|
||||
|
||||
if (c->err_info == NULL) {
|
||||
pci_free_consistent(h->pdev,
|
||||
sizeof(*c), c, cmd_dma_handle);
|
||||
return NULL;
|
||||
}
|
||||
memset(c->err_info, 0, sizeof(*c->err_info));
|
||||
|
||||
INIT_LIST_HEAD(&c->list);
|
||||
c->busaddr = (u32) cmd_dma_handle;
|
||||
|
Reference in New Issue
Block a user