forked from Minki/linux
USB: host: Use zeroing memory allocator rather than allocator/memset
Use dma_zalloc_coherent for allocating zeroed memory and remove unnecessary memset function. Done using Coccinelle. Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci 0-day tested with no failures. Suggested-by: Luis R. Rodriguez <mcgrof@kernel.org> Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d19000b885
commit
2b80a29bf8
@ -600,7 +600,7 @@ static int uhci_start(struct usb_hcd *hcd)
|
||||
uhci->dentry = dentry;
|
||||
#endif
|
||||
|
||||
uhci->frame = dma_alloc_coherent(uhci_dev(uhci),
|
||||
uhci->frame = dma_zalloc_coherent(uhci_dev(uhci),
|
||||
UHCI_NUMFRAMES * sizeof(*uhci->frame),
|
||||
&uhci->frame_dma_handle, GFP_KERNEL);
|
||||
if (!uhci->frame) {
|
||||
@ -608,7 +608,6 @@ static int uhci_start(struct usb_hcd *hcd)
|
||||
"unable to allocate consistent memory for frame list\n");
|
||||
goto err_alloc_frame;
|
||||
}
|
||||
memset(uhci->frame, 0, UHCI_NUMFRAMES * sizeof(*uhci->frame));
|
||||
|
||||
uhci->frame_cpu = kcalloc(UHCI_NUMFRAMES, sizeof(*uhci->frame_cpu),
|
||||
GFP_KERNEL);
|
||||
|
@ -1782,14 +1782,11 @@ int xhci_alloc_erst(struct xhci_hcd *xhci,
|
||||
struct xhci_erst_entry *entry;
|
||||
|
||||
size = sizeof(struct xhci_erst_entry) * evt_ring->num_segs;
|
||||
erst->entries = dma_alloc_coherent(xhci_to_hcd(xhci)->self.sysdev,
|
||||
size,
|
||||
&erst->erst_dma_addr,
|
||||
flags);
|
||||
erst->entries = dma_zalloc_coherent(xhci_to_hcd(xhci)->self.sysdev,
|
||||
size, &erst->erst_dma_addr, flags);
|
||||
if (!erst->entries)
|
||||
return -ENOMEM;
|
||||
|
||||
memset(erst->entries, 0, size);
|
||||
erst->num_entries = evt_ring->num_segs;
|
||||
|
||||
seg = evt_ring->first_seg;
|
||||
|
Loading…
Reference in New Issue
Block a user