diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2006-12-13 03:35:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:58 -0500 |
commit | 5cbded585d129d0226cb48ac4202b253c781be26 (patch) | |
tree | fb24edc194a57ee81a3bf8a4dd8a95030dd0ad22 /sound/oss/emu10k1 | |
parent | 0743b86800cf1dfbf96df4a438938127bbe4476c (diff) |
[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 <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Greg KH <greg@kroah.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Karsten Keil <kkeil@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Ian Kent <raven@themaw.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Jaroslav Kysela <perex@suse.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/emu10k1')
-rw-r--r-- | sound/oss/emu10k1/audio.c | 6 | ||||
-rw-r--r-- | sound/oss/emu10k1/cardmi.c | 2 | ||||
-rw-r--r-- | sound/oss/emu10k1/cardmo.c | 2 | ||||
-rw-r--r-- | sound/oss/emu10k1/midi.c | 10 | ||||
-rw-r--r-- | sound/oss/emu10k1/mixer.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c index 49f902f35c28..efcf589d7083 100644 --- a/sound/oss/emu10k1/audio.c +++ b/sound/oss/emu10k1/audio.c | |||
@@ -1139,7 +1139,7 @@ static int emu10k1_audio_open(struct inode *inode, struct file *file) | |||
1139 | 1139 | ||
1140 | match: | 1140 | match: |
1141 | 1141 | ||
1142 | wave_dev = (struct emu10k1_wavedevice *) kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL); | 1142 | wave_dev = kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL); |
1143 | 1143 | ||
1144 | if (wave_dev == NULL) { | 1144 | if (wave_dev == NULL) { |
1145 | ERROR(); | 1145 | ERROR(); |
@@ -1155,7 +1155,7 @@ match: | |||
1155 | /* Recording */ | 1155 | /* Recording */ |
1156 | struct wiinst *wiinst; | 1156 | struct wiinst *wiinst; |
1157 | 1157 | ||
1158 | if ((wiinst = (struct wiinst *) kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) { | 1158 | if ((wiinst = kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) { |
1159 | ERROR(); | 1159 | ERROR(); |
1160 | kfree(wave_dev); | 1160 | kfree(wave_dev); |
1161 | return -ENOMEM; | 1161 | return -ENOMEM; |
@@ -1211,7 +1211,7 @@ match: | |||
1211 | struct woinst *woinst; | 1211 | struct woinst *woinst; |
1212 | int i; | 1212 | int i; |
1213 | 1213 | ||
1214 | if ((woinst = (struct woinst *) kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) { | 1214 | if ((woinst = kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) { |
1215 | ERROR(); | 1215 | ERROR(); |
1216 | kfree(wave_dev); | 1216 | kfree(wave_dev); |
1217 | return -ENOMEM; | 1217 | return -ENOMEM; |
diff --git a/sound/oss/emu10k1/cardmi.c b/sound/oss/emu10k1/cardmi.c index 0545814cc67d..57674f8c8a2e 100644 --- a/sound/oss/emu10k1/cardmi.c +++ b/sound/oss/emu10k1/cardmi.c | |||
@@ -157,7 +157,7 @@ int emu10k1_mpuin_add_buffer(struct emu10k1_mpuin *card_mpuin, struct midi_hdr * | |||
157 | midihdr->flags |= MIDIBUF_INQUEUE; /* set */ | 157 | midihdr->flags |= MIDIBUF_INQUEUE; /* set */ |
158 | midihdr->flags &= ~MIDIBUF_DONE; /* clear */ | 158 | midihdr->flags &= ~MIDIBUF_DONE; /* clear */ |
159 | 159 | ||
160 | if ((midiq = (struct midi_queue *) kmalloc(sizeof(struct midi_queue), GFP_ATOMIC)) == NULL) { | 160 | if ((midiq = kmalloc(sizeof(struct midi_queue), GFP_ATOMIC)) == NULL) { |
161 | /* Message lost */ | 161 | /* Message lost */ |
162 | return -1; | 162 | return -1; |
163 | } | 163 | } |
diff --git a/sound/oss/emu10k1/cardmo.c b/sound/oss/emu10k1/cardmo.c index 5938d31f9e21..a8cc75db3e45 100644 --- a/sound/oss/emu10k1/cardmo.c +++ b/sound/oss/emu10k1/cardmo.c | |||
@@ -117,7 +117,7 @@ int emu10k1_mpuout_add_buffer(struct emu10k1_card *card, struct midi_hdr *midihd | |||
117 | midihdr->flags |= MIDIBUF_INQUEUE; | 117 | midihdr->flags |= MIDIBUF_INQUEUE; |
118 | midihdr->flags &= ~MIDIBUF_DONE; | 118 | midihdr->flags &= ~MIDIBUF_DONE; |
119 | 119 | ||
120 | if ((midiq = (struct midi_queue *) kmalloc(sizeof(struct midi_queue), GFP_KERNEL)) == NULL) { | 120 | if ((midiq = kmalloc(sizeof(struct midi_queue), GFP_KERNEL)) == NULL) { |
121 | /* Message lost */ | 121 | /* Message lost */ |
122 | return -1; | 122 | return -1; |
123 | } | 123 | } |
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c index 8ac77df86397..cca3dad2bdf4 100644 --- a/sound/oss/emu10k1/midi.c +++ b/sound/oss/emu10k1/midi.c | |||
@@ -58,7 +58,7 @@ static int midiin_add_buffer(struct emu10k1_mididevice *midi_dev, struct midi_hd | |||
58 | { | 58 | { |
59 | struct midi_hdr *midihdr; | 59 | struct midi_hdr *midihdr; |
60 | 60 | ||
61 | if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) { | 61 | if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) { |
62 | ERROR(); | 62 | ERROR(); |
63 | return -EINVAL; | 63 | return -EINVAL; |
64 | } | 64 | } |
@@ -128,7 +128,7 @@ match: | |||
128 | mutex_lock(&card->open_sem); | 128 | mutex_lock(&card->open_sem); |
129 | } | 129 | } |
130 | 130 | ||
131 | if ((midi_dev = (struct emu10k1_mididevice *) kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL) | 131 | if ((midi_dev = kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL) |
132 | return -EINVAL; | 132 | return -EINVAL; |
133 | 133 | ||
134 | midi_dev->card = card; | 134 | midi_dev->card = card; |
@@ -328,7 +328,7 @@ static ssize_t emu10k1_midi_write(struct file *file, const char __user *buffer, | |||
328 | if (!access_ok(VERIFY_READ, buffer, count)) | 328 | if (!access_ok(VERIFY_READ, buffer, count)) |
329 | return -EFAULT; | 329 | return -EFAULT; |
330 | 330 | ||
331 | if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) | 331 | if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) |
332 | return -EINVAL; | 332 | return -EINVAL; |
333 | 333 | ||
334 | midihdr->bufferlength = count; | 334 | midihdr->bufferlength = count; |
@@ -490,7 +490,7 @@ int emu10k1_seq_midi_open(int dev, int mode, | |||
490 | 490 | ||
491 | DPF(2, "emu10k1_seq_midi_open()\n"); | 491 | DPF(2, "emu10k1_seq_midi_open()\n"); |
492 | 492 | ||
493 | if ((midi_dev = (struct emu10k1_mididevice *) kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL) | 493 | if ((midi_dev = kmalloc(sizeof(*midi_dev), GFP_KERNEL)) == NULL) |
494 | return -EINVAL; | 494 | return -EINVAL; |
495 | 495 | ||
496 | midi_dev->card = card; | 496 | midi_dev->card = card; |
@@ -540,7 +540,7 @@ int emu10k1_seq_midi_out(int dev, unsigned char midi_byte) | |||
540 | 540 | ||
541 | card = midi_devs[dev]->devc; | 541 | card = midi_devs[dev]->devc; |
542 | 542 | ||
543 | if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) | 543 | if ((midihdr = kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) |
544 | return -EINVAL; | 544 | return -EINVAL; |
545 | 545 | ||
546 | midihdr->bufferlength = 1; | 546 | midihdr->bufferlength = 1; |
diff --git a/sound/oss/emu10k1/mixer.c b/sound/oss/emu10k1/mixer.c index cbcaaa34189a..6419796c2ed7 100644 --- a/sound/oss/emu10k1/mixer.c +++ b/sound/oss/emu10k1/mixer.c | |||
@@ -194,7 +194,7 @@ static int emu10k1_private_mixer(struct emu10k1_card *card, unsigned int cmd, un | |||
194 | 194 | ||
195 | case SOUND_MIXER_PRIVATE3: | 195 | case SOUND_MIXER_PRIVATE3: |
196 | 196 | ||
197 | ctl = (struct mixer_private_ioctl *) kmalloc(sizeof(struct mixer_private_ioctl), GFP_KERNEL); | 197 | ctl = kmalloc(sizeof(struct mixer_private_ioctl), GFP_KERNEL); |
198 | if (ctl == NULL) | 198 | if (ctl == NULL) |
199 | return -ENOMEM; | 199 | return -ENOMEM; |
200 | 200 | ||