mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -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
|
|
@ -288,7 +288,7 @@ int aac_get_containers(struct aac_dev *dev)
|
|||
|
||||
if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS)
|
||||
maximum_num_containers = MAXIMUM_NUM_CONTAINERS;
|
||||
fsa_dev_ptr = (struct fsa_dev_info *) kmalloc(
|
||||
fsa_dev_ptr = kmalloc(
|
||||
sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL);
|
||||
if (!fsa_dev_ptr) {
|
||||
aac_fib_free(fibptr);
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
|
|||
* Ok now init the communication subsystem
|
||||
*/
|
||||
|
||||
dev->queues = (struct aac_queue_block *) kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
|
||||
dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
|
||||
if (dev->queues == NULL) {
|
||||
printk(KERN_ERR "Error could not allocate comm region.\n");
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -699,7 +699,7 @@ static int aha1542_queuecommand(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
|
|||
#endif
|
||||
int i;
|
||||
ccb[mbo].op = 2; /* SCSI Initiator Command w/scatter-gather */
|
||||
SCpnt->host_scribble = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
SCpnt->host_scribble = kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
sgpnt = (struct scatterlist *) SCpnt->request_buffer;
|
||||
cptr = (struct chain *) SCpnt->host_scribble;
|
||||
if (cptr == NULL) {
|
||||
|
|
|
|||
|
|
@ -2565,7 +2565,7 @@ aic7xxx_allocate_scb(struct aic7xxx_host *p)
|
|||
}
|
||||
}
|
||||
scb_count = min( (i-1), p->scb_data->maxscbs - p->scb_data->numscbs);
|
||||
scb_ap = (struct aic7xxx_scb *)kmalloc(sizeof (struct aic7xxx_scb) * scb_count
|
||||
scb_ap = kmalloc(sizeof (struct aic7xxx_scb) * scb_count
|
||||
+ sizeof(struct aic7xxx_scb_dma), GFP_ATOMIC);
|
||||
if (scb_ap == NULL)
|
||||
return(0);
|
||||
|
|
|
|||
|
|
@ -4319,7 +4319,7 @@ static int __devinit adapter_sg_tables_alloc(struct AdapterCtlBlk *acb)
|
|||
|
||||
dprintkdbg(DBG_1, "Allocate %i pages for SG tables\n", pages);
|
||||
while (pages--) {
|
||||
ptr = (struct SGentry *)kmalloc(PAGE_SIZE, GFP_KERNEL);
|
||||
ptr = kmalloc(PAGE_SIZE, GFP_KERNEL);
|
||||
if (!ptr) {
|
||||
adapter_sg_tables_free(acb);
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ static void adpt_inquiry(adpt_hba* pHba)
|
|||
s32 rcode;
|
||||
|
||||
memset(msg, 0, sizeof(msg));
|
||||
buf = (u8*)kmalloc(80,GFP_KERNEL|ADDR32);
|
||||
buf = kmalloc(80,GFP_KERNEL|ADDR32);
|
||||
if(!buf){
|
||||
printk(KERN_ERR"%s: Could not allocate buffer\n",pHba->name);
|
||||
return;
|
||||
|
|
@ -1311,7 +1311,7 @@ static s32 adpt_i2o_reset_hba(adpt_hba* pHba)
|
|||
schedule_timeout_uninterruptible(1);
|
||||
} while (m == EMPTY_QUEUE);
|
||||
|
||||
status = (u8*)kmalloc(4, GFP_KERNEL|ADDR32);
|
||||
status = kmalloc(4, GFP_KERNEL|ADDR32);
|
||||
if(status == NULL) {
|
||||
adpt_send_nop(pHba, m);
|
||||
printk(KERN_ERR"IOP reset failed - no free memory.\n");
|
||||
|
|
@ -1444,7 +1444,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
|
|||
}
|
||||
continue;
|
||||
}
|
||||
d = (struct i2o_device *)kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
|
||||
d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
|
||||
if(d==NULL)
|
||||
{
|
||||
printk(KERN_CRIT"%s: Out of memory for I2O device data.\n",pHba->name);
|
||||
|
|
@ -2425,7 +2425,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
|
|||
pDev = pDev->next_lun;
|
||||
}
|
||||
if(!pDev ) { // Something new add it
|
||||
d = (struct i2o_device *)kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
|
||||
d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
|
||||
if(d==NULL)
|
||||
{
|
||||
printk(KERN_CRIT "Out of memory for I2O device data.\n");
|
||||
|
|
@ -2728,7 +2728,7 @@ static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba)
|
|||
|
||||
kfree(pHba->reply_pool);
|
||||
|
||||
pHba->reply_pool = (u32*)kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
|
||||
pHba->reply_pool = kmalloc(pHba->reply_fifo_size * REPLY_FRAME_SIZE * 4, GFP_KERNEL|ADDR32);
|
||||
if(!pHba->reply_pool){
|
||||
printk(KERN_ERR"%s: Could not allocate reply pool\n",pHba->name);
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -2828,7 +2828,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)
|
|||
|
||||
for (; tul_num_scb >= MAX_TARGETS + 3; tul_num_scb--) {
|
||||
i = tul_num_ch * tul_num_scb * sizeof(SCB);
|
||||
if ((tul_scb = (SCB *) kmalloc(i, GFP_ATOMIC | GFP_DMA)) != NULL)
|
||||
if ((tul_scb = kmalloc(i, GFP_ATOMIC | GFP_DMA)) != NULL)
|
||||
break;
|
||||
}
|
||||
if (tul_scb == NULL) {
|
||||
|
|
|
|||
|
|
@ -5777,7 +5777,7 @@ static int osst_probe(struct device *dev)
|
|||
dev_num = i;
|
||||
|
||||
/* allocate a struct osst_tape for this device */
|
||||
tpnt = (struct osst_tape *)kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
|
||||
tpnt = kmalloc(sizeof(struct osst_tape), GFP_ATOMIC);
|
||||
if (tpnt == NULL) {
|
||||
write_unlock(&os_scsi_tapes_lock);
|
||||
printk(KERN_ERR "osst :E: Can't allocate device descriptor, device not attached.\n");
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ int __init pluto_detect(struct scsi_host_template *tpnt)
|
|||
#endif
|
||||
return 0;
|
||||
}
|
||||
fcs = (struct ctrl_inquiry *) kmalloc (sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
|
||||
fcs = kmalloc(sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
|
||||
if (!fcs) {
|
||||
printk ("PLUTO: Not enough memory to probe\n");
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ int sr_is_xa(Scsi_CD *cd)
|
|||
if (!xa_test)
|
||||
return 0;
|
||||
|
||||
raw_sector = (unsigned char *) kmalloc(2048, GFP_KERNEL | SR_GFP_DMA(cd));
|
||||
raw_sector = kmalloc(2048, GFP_KERNEL | SR_GFP_DMA(cd));
|
||||
if (!raw_sector)
|
||||
return -ENOMEM;
|
||||
if (0 == sr_read_sector(cd, cd->ms_offset + 16,
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength)
|
|||
density = (blocklength > 2048) ? 0x81 : 0x83;
|
||||
#endif
|
||||
|
||||
buffer = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
if (!buffer)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ int sr_cd_check(struct cdrom_device_info *cdi)
|
|||
if (cd->cdi.mask & CDC_MULTI_SESSION)
|
||||
return 0;
|
||||
|
||||
buffer = (unsigned char *) kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
|
||||
if (!buffer)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue