Skip to content

Commit

Permalink
sound/oss: Remove unnecessary casts of void ptr
Browse files Browse the repository at this point in the history
The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.

This patch removes such casts from sound/oss/

Signed-off-by: Jesper Juhl <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
jjuhl authored and tiwai committed Nov 11, 2010
1 parent f724bd2 commit ea7dd25
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions sound/oss/midibuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ int MIDIbuf_open(int dev, struct file *file)
return err;

parms[dev].prech_timeout = MAX_SCHEDULE_TIMEOUT;
midi_in_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));
midi_in_buf[dev] = vmalloc(sizeof(struct midi_buf));

if (midi_in_buf[dev] == NULL)
{
Expand All @@ -188,7 +188,7 @@ int MIDIbuf_open(int dev, struct file *file)
}
midi_in_buf[dev]->len = midi_in_buf[dev]->head = midi_in_buf[dev]->tail = 0;

midi_out_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));
midi_out_buf[dev] = vmalloc(sizeof(struct midi_buf));

if (midi_out_buf[dev] == NULL)
{
Expand Down
6 changes: 3 additions & 3 deletions sound/oss/pss.c
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ static int pss_coproc_ioctl(void *dev_info, unsigned int cmd, void __user *arg,
return 0;

case SNDCTL_COPR_LOAD:
buf = (copr_buffer *) vmalloc(sizeof(copr_buffer));
buf = vmalloc(sizeof(copr_buffer));
if (buf == NULL)
return -ENOSPC;
if (copy_from_user(buf, arg, sizeof(copr_buffer))) {
Expand All @@ -871,7 +871,7 @@ static int pss_coproc_ioctl(void *dev_info, unsigned int cmd, void __user *arg,
return err;

case SNDCTL_COPR_SENDMSG:
mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));
mbuf = vmalloc(sizeof(copr_msg));
if (mbuf == NULL)
return -ENOSPC;
if (copy_from_user(mbuf, arg, sizeof(copr_msg))) {
Expand All @@ -895,7 +895,7 @@ static int pss_coproc_ioctl(void *dev_info, unsigned int cmd, void __user *arg,

case SNDCTL_COPR_RCVMSG:
err = 0;
mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));
mbuf = vmalloc(sizeof(copr_msg));
if (mbuf == NULL)
return -ENOSPC;
data = (unsigned short *)mbuf->data;
Expand Down
4 changes: 2 additions & 2 deletions sound/oss/sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1646,13 +1646,13 @@ void sequencer_init(void)
{
if (sequencer_ok)
return;
queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ);
queue = vmalloc(SEQ_MAX_QUEUE * EV_SZ);
if (queue == NULL)
{
printk(KERN_ERR "sequencer: Can't allocate memory for sequencer output queue\n");
return;
}
iqueue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * IEV_SZ);
iqueue = vmalloc(SEQ_MAX_QUEUE * IEV_SZ);
if (iqueue == NULL)
{
printk(KERN_ERR "sequencer: Can't allocate memory for sequencer input queue\n");
Expand Down

0 comments on commit ea7dd25

Please sign in to comment.