[PATCH] USB: Remove unneeded kmalloc() return value casts

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove kmalloc() return value casts that we don't need from
drivers/usb/*

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Jesper Juhl and committed by

Greg Kroah-Hartman 20 years ago 0e8eb0f0 740a4282

+7 -7

4 changed files

expand all

drivers

usb

media

usbvideo.c

w9968cf.c

misc

auerswald.c

rio500.c

+1 -1

drivers/usb/media/usbvideo.c

··· 725 725 /* Allocate user_data separately because of kmalloc's limits */ 726 726 if (num_extra > 0) { 727 727 up->user_size = num_cams * num_extra; 728 - up->user_data = (char *) kmalloc(up->user_size, GFP_KERNEL); 728 + up->user_data = kmalloc(up->user_size, GFP_KERNEL); 729 729 if (up->user_data == NULL) { 730 730 err("%s: Failed to allocate user_data (%d. bytes)", 731 731 __FUNCTION__, up->user_size);

+2 -2

drivers/usb/media/w9968cf.c

··· 3554 3554 3555 3555 3556 3556 /* Allocate 2 bytes of memory for camera control USB transfers */ 3557 - if (!(cam->control_buffer = (u16*)kmalloc(2, GFP_KERNEL))) { 3557 + if (!(cam->control_buffer = kmalloc(2, GFP_KERNEL))) { 3558 3558 DBG(1,"Couldn't allocate memory for camera control transfers") 3559 3559 err = -ENOMEM; 3560 3560 goto fail; ··· 3562 3562 memset(cam->control_buffer, 0, 2); 3563 3563 3564 3564 /* Allocate 8 bytes of memory for USB data transfers to the FSB */ 3565 - if (!(cam->data_buffer = (u16*)kmalloc(8, GFP_KERNEL))) { 3565 + if (!(cam->data_buffer = kmalloc(8, GFP_KERNEL))) { 3566 3566 DBG(1, "Couldn't allocate memory for data " 3567 3567 "transfers to the FSB") 3568 3568 err = -ENOMEM;

+2 -2

drivers/usb/misc/auerswald.c

··· 767 767 memset (bep, 0, sizeof (auerbuf_t)); 768 768 bep->list = bcp; 769 769 INIT_LIST_HEAD (&bep->buff_list); 770 - bep->bufp = (char *) kmalloc (bufsize, GFP_KERNEL); 770 + bep->bufp = kmalloc (bufsize, GFP_KERNEL); 771 771 if (!bep->bufp) 772 772 goto bl_fail; 773 773 bep->dr = (struct usb_ctrlrequest *) kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL); ··· 1123 1123 } 1124 1124 } 1125 1125 if (!cp->intbufp) { 1126 - cp->intbufp = (char *) kmalloc (irqsize, GFP_KERNEL); 1126 + cp->intbufp = kmalloc (irqsize, GFP_KERNEL); 1127 1127 if (!cp->intbufp) { 1128 1128 ret = -ENOMEM; 1129 1129 goto intoend;

+2 -2

drivers/usb/misc/rio500.c

··· 465 465 466 466 rio->rio_dev = dev; 467 467 468 - if (!(rio->obuf = (char *) kmalloc(OBUF_SIZE, GFP_KERNEL))) { 468 + if (!(rio->obuf = kmalloc(OBUF_SIZE, GFP_KERNEL))) { 469 469 err("probe_rio: Not enough memory for the output buffer"); 470 470 usb_deregister_dev(intf, &usb_rio_class); 471 471 return -ENOMEM; 472 472 } 473 473 dbg("probe_rio: obuf address:%p", rio->obuf); 474 474 475 - if (!(rio->ibuf = (char *) kmalloc(IBUF_SIZE, GFP_KERNEL))) { 475 + if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) { 476 476 err("probe_rio: Not enough memory for the input buffer"); 477 477 usb_deregister_dev(intf, &usb_rio_class); 478 478 kfree(rio->obuf);