mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 15:12:04 +00:00
usb: xhci: avoid type conversion of void *
void * can be assigned to any pointer variable. Avoid unnecessary conversions. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
7ec87e4192
commit
3fade88686
1 changed files with 9 additions and 12 deletions
|
@ -279,10 +279,10 @@ static struct xhci_segment *xhci_segment_alloc(void)
|
|||
{
|
||||
struct xhci_segment *seg;
|
||||
|
||||
seg = (struct xhci_segment *)malloc(sizeof(struct xhci_segment));
|
||||
seg = malloc(sizeof(struct xhci_segment));
|
||||
BUG_ON(!seg);
|
||||
|
||||
seg->trbs = (union xhci_trb *)xhci_malloc(SEGMENT_SIZE);
|
||||
seg->trbs = xhci_malloc(SEGMENT_SIZE);
|
||||
|
||||
seg->next = NULL;
|
||||
|
||||
|
@ -309,7 +309,7 @@ struct xhci_ring *xhci_ring_alloc(unsigned int num_segs, bool link_trbs)
|
|||
struct xhci_ring *ring;
|
||||
struct xhci_segment *prev;
|
||||
|
||||
ring = (struct xhci_ring *)malloc(sizeof(struct xhci_ring));
|
||||
ring = malloc(sizeof(struct xhci_ring));
|
||||
BUG_ON(!ring);
|
||||
|
||||
if (num_segs == 0)
|
||||
|
@ -425,8 +425,7 @@ static struct xhci_container_ctx
|
|||
{
|
||||
struct xhci_container_ctx *ctx;
|
||||
|
||||
ctx = (struct xhci_container_ctx *)
|
||||
malloc(sizeof(struct xhci_container_ctx));
|
||||
ctx = malloc(sizeof(struct xhci_container_ctx));
|
||||
BUG_ON(!ctx);
|
||||
|
||||
BUG_ON((type != XHCI_CTX_TYPE_DEVICE) && (type != XHCI_CTX_TYPE_INPUT));
|
||||
|
@ -436,7 +435,7 @@ static struct xhci_container_ctx
|
|||
if (type == XHCI_CTX_TYPE_INPUT)
|
||||
ctx->size += CTX_SIZE(readl(&ctrl->hccr->cr_hccparams));
|
||||
|
||||
ctx->bytes = (u8 *)xhci_malloc(ctx->size);
|
||||
ctx->bytes = xhci_malloc(ctx->size);
|
||||
|
||||
return ctx;
|
||||
}
|
||||
|
@ -458,8 +457,7 @@ int xhci_alloc_virt_device(struct xhci_ctrl *ctrl, unsigned int slot_id)
|
|||
return -EEXIST;
|
||||
}
|
||||
|
||||
ctrl->devs[slot_id] = (struct xhci_virt_device *)
|
||||
malloc(sizeof(struct xhci_virt_device));
|
||||
ctrl->devs[slot_id] = malloc(sizeof(struct xhci_virt_device));
|
||||
|
||||
if (!ctrl->devs[slot_id]) {
|
||||
puts("Failed to allocate virtual device\n");
|
||||
|
@ -518,8 +516,7 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,
|
|||
struct xhci_segment *seg;
|
||||
|
||||
/* DCBAA initialization */
|
||||
ctrl->dcbaa = (struct xhci_device_context_array *)
|
||||
xhci_malloc(sizeof(struct xhci_device_context_array));
|
||||
ctrl->dcbaa = xhci_malloc(sizeof(struct xhci_device_context_array));
|
||||
if (ctrl->dcbaa == NULL) {
|
||||
puts("unable to allocate DCBA\n");
|
||||
return -ENOMEM;
|
||||
|
@ -555,8 +552,8 @@ int xhci_mem_init(struct xhci_ctrl *ctrl, struct xhci_hccr *hccr,
|
|||
|
||||
/* Event ring does not maintain link TRB */
|
||||
ctrl->event_ring = xhci_ring_alloc(ERST_NUM_SEGS, false);
|
||||
ctrl->erst.entries = (struct xhci_erst_entry *)
|
||||
xhci_malloc(sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS);
|
||||
ctrl->erst.entries = xhci_malloc(sizeof(struct xhci_erst_entry) *
|
||||
ERST_NUM_SEGS);
|
||||
|
||||
ctrl->erst.num_entries = ERST_NUM_SEGS;
|
||||
|
||||
|
|
Loading…
Reference in a new issue