mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
[PATCH] getting rid of all casts of k[cmz]alloc() calls
Run this: #!/bin/sh for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do echo "De-casting $f..." perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f done And then go through and reinstate those cases where code is casting pointers to non-pointers. And then drop a few hunks which conflicted with outstanding work. Cc: Russell King <[email protected]>, Ian Molton <[email protected]> Cc: Mikael Starvik <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Kyle McMartin <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Greg KH <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Paul Fulghum <[email protected]> Cc: Alan Cox <[email protected]> Cc: Karsten Keil <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: James Bottomley <[email protected]> Cc: Ian Kent <[email protected]> Cc: Steven French <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Neil Brown <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
0743b86800
commit
5cbded585d
172 changed files with 250 additions and 250 deletions
|
|
@ -688,7 +688,7 @@ raw3215_probe (struct ccw_device *cdev)
|
|||
raw->cdev = cdev;
|
||||
raw->inbuf = (char *) raw + sizeof(struct raw3215_info);
|
||||
memset(raw, 0, sizeof(struct raw3215_info));
|
||||
raw->buffer = (char *) kmalloc(RAW3215_BUFFER_SIZE,
|
||||
raw->buffer = kmalloc(RAW3215_BUFFER_SIZE,
|
||||
GFP_KERNEL|GFP_DMA);
|
||||
if (raw->buffer == NULL) {
|
||||
spin_lock(&raw3215_device_lock);
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, struct kbentry __user *user_kbe,
|
|||
if (!(key_map = kbd->key_maps[tmp.kb_table])) {
|
||||
int j;
|
||||
|
||||
key_map = (ushort *) kmalloc(sizeof(plain_map),
|
||||
key_map = kmalloc(sizeof(plain_map),
|
||||
GFP_KERNEL);
|
||||
if (!key_map)
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ cpi_prepare_req(void)
|
|||
struct cpi_sccb *sccb;
|
||||
struct cpi_evbuf *evb;
|
||||
|
||||
req = (struct sclp_req *) kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
|
||||
req = kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
|
||||
if (req == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
sccb = (struct cpi_sccb *) __get_free_page(GFP_KERNEL | GFP_DMA);
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev,
|
|||
struct completion work;
|
||||
int rc;
|
||||
|
||||
ap_msg.message = (void *) kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
if (!ap_msg.message)
|
||||
return -ENOMEM;
|
||||
ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
|
||||
|
|
@ -337,7 +337,7 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev,
|
|||
struct completion work;
|
||||
int rc;
|
||||
|
||||
ap_msg.message = (void *) kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
ap_msg.message = kmalloc(CEX2A_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
if (!ap_msg.message)
|
||||
return -ENOMEM;
|
||||
ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
|
|||
struct completion work;
|
||||
int rc;
|
||||
|
||||
ap_msg.message = (void *) kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
if (!ap_msg.message)
|
||||
return -ENOMEM;
|
||||
ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
|
||||
|
|
@ -321,7 +321,7 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
|
|||
struct completion work;
|
||||
int rc;
|
||||
|
||||
ap_msg.message = (void *) kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
|
||||
if (!ap_msg.message)
|
||||
return -ENOMEM;
|
||||
ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev, struct ica_xcRB *xcRB)
|
|||
};
|
||||
int rc;
|
||||
|
||||
ap_msg.message = (void *) kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
|
||||
ap_msg.message = kmalloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE, GFP_KERNEL);
|
||||
if (!ap_msg.message)
|
||||
return -ENOMEM;
|
||||
ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
|
||||
|
|
|
|||
|
|
@ -1646,7 +1646,7 @@ add_channel(struct ccw_device *cdev, enum channel_types type)
|
|||
return -1;
|
||||
}
|
||||
memset(ch, 0, sizeof (struct channel));
|
||||
if ((ch->ccw = (struct ccw1 *) kmalloc(8*sizeof(struct ccw1),
|
||||
if ((ch->ccw = kmalloc(8*sizeof(struct ccw1),
|
||||
GFP_KERNEL | GFP_DMA)) == NULL) {
|
||||
kfree(ch);
|
||||
ctc_pr_warn("ctc: Out of memory in add_channel\n");
|
||||
|
|
@ -1693,7 +1693,7 @@ add_channel(struct ccw_device *cdev, enum channel_types type)
|
|||
return -1;
|
||||
}
|
||||
fsm_newstate(ch->fsm, CH_STATE_IDLE);
|
||||
if ((ch->irb = (struct irb *) kmalloc(sizeof (struct irb),
|
||||
if ((ch->irb = kmalloc(sizeof (struct irb),
|
||||
GFP_KERNEL)) == NULL) {
|
||||
ctc_pr_warn("ctc: Out of memory in add_channel\n");
|
||||
kfree_fsm(ch->fsm);
|
||||
|
|
@ -2535,7 +2535,7 @@ ctc_print_statistics(struct ctc_priv *priv)
|
|||
DBF_TEXT(trace, 4, __FUNCTION__);
|
||||
if (!priv)
|
||||
return;
|
||||
sbuf = (char *)kmalloc(2048, GFP_KERNEL);
|
||||
sbuf = kmalloc(2048, GFP_KERNEL);
|
||||
if (sbuf == NULL)
|
||||
return;
|
||||
p = sbuf;
|
||||
|
|
|
|||
|
|
@ -772,7 +772,7 @@ iucv_register_program (__u8 pgmname[16],
|
|||
}
|
||||
|
||||
/* Allocate handler entry */
|
||||
new_handler = (handler *)kmalloc(sizeof(handler), GFP_ATOMIC);
|
||||
new_handler = kmalloc(sizeof(handler), GFP_ATOMIC);
|
||||
if (new_handler == NULL) {
|
||||
printk(KERN_WARNING "%s: storage allocation for new handler "
|
||||
"failed.\n", __FUNCTION__);
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ zfcp_device_setup(char *devstr)
|
|||
return 0;
|
||||
|
||||
len = strlen(devstr) + 1;
|
||||
str = (char *) kmalloc(len, GFP_KERNEL);
|
||||
str = kmalloc(len, GFP_KERNEL);
|
||||
if (!str)
|
||||
goto err_out;
|
||||
memcpy(str, devstr, len);
|
||||
|
|
|
|||
Loading…
Reference in a new issue