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>
[backport of mainline commit 3fade88686e71c9acee4cbeb3ae9706bbc845608]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I66ed937f1331ff1ea4c1df6b594a997efc26db01

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 1da0524..4c303ae 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -280,10 +280,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;
 
@@ -310,7 +310,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)
@@ -426,8 +426,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));
@@ -437,7 +436,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;
 }
@@ -459,8 +458,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");
@@ -519,8 +517,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;
@@ -556,8 +553,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;