diff options
| author | Joe Perches | 2014-08-08 23:24:48 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-08-09 00:57:30 +0200 |
| commit | 8b983be54bb5c4ff133e3aa45fe50669089d0a68 (patch) | |
| tree | 4ddf3d5c26c0155d55a4599b9b783d868164a09d /drivers/staging/slicoss | |
| parent | scsi: use pci_zalloc_consistent (diff) | |
| download | kernel-qcow2-linux-8b983be54bb5c4ff133e3aa45fe50669089d0a68.tar.gz kernel-qcow2-linux-8b983be54bb5c4ff133e3aa45fe50669089d0a68.tar.xz kernel-qcow2-linux-8b983be54bb5c4ff133e3aa45fe50669089d0a68.zip | |
staging: use pci_zalloc_consistent
Remove the now unnecessary memset too.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging/slicoss')
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 50ece291fc6a..f35fa3dfe22c 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -1191,18 +1191,15 @@ static int slic_rspqueue_init(struct adapter *adapter) rspq->num_pages = SLIC_RSPQ_PAGES_GB; for (i = 0; i < rspq->num_pages; i++) { - rspq->vaddr[i] = pci_alloc_consistent(adapter->pcidev, - PAGE_SIZE, - &rspq->paddr[i]); + rspq->vaddr[i] = pci_zalloc_consistent(adapter->pcidev, + PAGE_SIZE, + &rspq->paddr[i]); if (!rspq->vaddr[i]) { dev_err(&adapter->pcidev->dev, "pci_alloc_consistent failed\n"); slic_rspqueue_free(adapter); return -ENOMEM; } - /* FIXME: - * do we really need this assertions (4K PAGE_SIZE aligned addr)? */ - memset(rspq->vaddr[i], 0, PAGE_SIZE); if (paddrh == 0) { slic_reg32_write(&slic_regs->slic_rbar, |