uml: arch/um/drivers formatting
Style fixes for the rest of the drivers. arch/um/drivers should be pretty CodingStyle-compliant now. Except for the ubd driver, which will have to be treated separately. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike
committed by
Linus Torvalds
Linus Torvalds
parent
54ae36f24b
commit
cb8fa61c2b
@ -1,16 +1,14 @@
|
||||
/*
|
||||
* Copyright (C) 2002 Steve Schmidtke
|
||||
/*
|
||||
* Copyright (C) 2002 Steve Schmidtke
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include "linux/module.h"
|
||||
#include "linux/init.h"
|
||||
#include "linux/slab.h"
|
||||
#include "linux/fs.h"
|
||||
#include "linux/module.h"
|
||||
#include "linux/slab.h"
|
||||
#include "linux/sound.h"
|
||||
#include "linux/soundcard.h"
|
||||
#include "asm/uaccess.h"
|
||||
#include "kern_util.h"
|
||||
#include "init.h"
|
||||
#include "os.h"
|
||||
|
||||
@ -25,7 +23,8 @@ struct hostmixer_state {
|
||||
#define HOSTAUDIO_DEV_DSP "/dev/sound/dsp"
|
||||
#define HOSTAUDIO_DEV_MIXER "/dev/sound/mixer"
|
||||
|
||||
/* Changed either at boot time or module load time. At boot, this is
|
||||
/*
|
||||
* Changed either at boot time or module load time. At boot, this is
|
||||
* single-threaded; at module load, multiple modules would each have
|
||||
* their own copy of these variables.
|
||||
*/
|
||||
@ -44,7 +43,7 @@ static char *mixer = HOSTAUDIO_DEV_MIXER;
|
||||
static int set_dsp(char *name, int *add)
|
||||
{
|
||||
dsp = name;
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
__uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
|
||||
@ -52,7 +51,7 @@ __uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
|
||||
static int set_mixer(char *name, int *add)
|
||||
{
|
||||
mixer = name;
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
__uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
|
||||
@ -77,23 +76,23 @@ static ssize_t hostaudio_read(struct file *file, char __user *buffer,
|
||||
int err;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: read called, count = %d\n", count);
|
||||
printk(KERN_DEBUG "hostaudio: read called, count = %d\n", count);
|
||||
#endif
|
||||
|
||||
kbuf = kmalloc(count, GFP_KERNEL);
|
||||
if(kbuf == NULL)
|
||||
return(-ENOMEM);
|
||||
if (kbuf == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
err = os_read_file(state->fd, kbuf, count);
|
||||
if(err < 0)
|
||||
if (err < 0)
|
||||
goto out;
|
||||
|
||||
if(copy_to_user(buffer, kbuf, err))
|
||||
if (copy_to_user(buffer, kbuf, err))
|
||||
err = -EFAULT;
|
||||
|
||||
out:
|
||||
kfree(kbuf);
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
|
||||
@ -104,40 +103,40 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
|
||||
int err;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: write called, count = %d\n", count);
|
||||
printk(KERN_DEBUG "hostaudio: write called, count = %d\n", count);
|
||||
#endif
|
||||
|
||||
kbuf = kmalloc(count, GFP_KERNEL);
|
||||
if(kbuf == NULL)
|
||||
return(-ENOMEM);
|
||||
if (kbuf == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
err = -EFAULT;
|
||||
if(copy_from_user(kbuf, buffer, count))
|
||||
if (copy_from_user(kbuf, buffer, count))
|
||||
goto out;
|
||||
|
||||
err = os_write_file(state->fd, kbuf, count);
|
||||
if(err < 0)
|
||||
if (err < 0)
|
||||
goto out;
|
||||
*ppos += err;
|
||||
|
||||
out:
|
||||
kfree(kbuf);
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
static unsigned int hostaudio_poll(struct file *file,
|
||||
static unsigned int hostaudio_poll(struct file *file,
|
||||
struct poll_table_struct *wait)
|
||||
{
|
||||
unsigned int mask = 0;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: poll called (unimplemented)\n");
|
||||
printk(KERN_DEBUG "hostaudio: poll called (unimplemented)\n");
|
||||
#endif
|
||||
|
||||
return(mask);
|
||||
return mask;
|
||||
}
|
||||
|
||||
static int hostaudio_ioctl(struct inode *inode, struct file *file,
|
||||
static int hostaudio_ioctl(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct hostaudio_state *state = file->private_data;
|
||||
@ -145,7 +144,7 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
|
||||
int err;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: ioctl called, cmd = %u\n", cmd);
|
||||
printk(KERN_DEBUG "hostaudio: ioctl called, cmd = %u\n", cmd);
|
||||
#endif
|
||||
switch(cmd){
|
||||
case SNDCTL_DSP_SPEED:
|
||||
@ -154,8 +153,8 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
|
||||
case SNDCTL_DSP_CHANNELS:
|
||||
case SNDCTL_DSP_SUBDIVIDE:
|
||||
case SNDCTL_DSP_SETFRAGMENT:
|
||||
if(get_user(data, (int __user *) arg))
|
||||
return(-EFAULT);
|
||||
if (get_user(data, (int __user *) arg))
|
||||
return EFAULT;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -170,14 +169,14 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
|
||||
case SNDCTL_DSP_CHANNELS:
|
||||
case SNDCTL_DSP_SUBDIVIDE:
|
||||
case SNDCTL_DSP_SETFRAGMENT:
|
||||
if(put_user(data, (int __user *) arg))
|
||||
return(-EFAULT);
|
||||
if (put_user(data, (int __user *) arg))
|
||||
return -EFAULT;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int hostaudio_open(struct inode *inode, struct file *file)
|
||||
@ -187,24 +186,26 @@ static int hostaudio_open(struct inode *inode, struct file *file)
|
||||
int ret;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: open called (host: %s)\n", dsp);
|
||||
printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);
|
||||
#endif
|
||||
|
||||
state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
|
||||
if(state == NULL)
|
||||
return(-ENOMEM);
|
||||
if (state == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
if(file->f_mode & FMODE_READ) r = 1;
|
||||
if(file->f_mode & FMODE_WRITE) w = 1;
|
||||
if (file->f_mode & FMODE_READ)
|
||||
r = 1;
|
||||
if (file->f_mode & FMODE_WRITE)
|
||||
w = 1;
|
||||
|
||||
ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
|
||||
if(ret < 0){
|
||||
if (ret < 0) {
|
||||
kfree(state);
|
||||
return(ret);
|
||||
return ret;
|
||||
}
|
||||
state->fd = ret;
|
||||
file->private_data = state;
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hostaudio_release(struct inode *inode, struct file *file)
|
||||
@ -212,26 +213,26 @@ static int hostaudio_release(struct inode *inode, struct file *file)
|
||||
struct hostaudio_state *state = file->private_data;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostaudio: release called\n");
|
||||
printk(KERN_DEBUG "hostaudio: release called\n");
|
||||
#endif
|
||||
os_close_file(state->fd);
|
||||
kfree(state);
|
||||
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* /dev/mixer file operations */
|
||||
|
||||
static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
|
||||
static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct hostmixer_state *state = file->private_data;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostmixer: ioctl called\n");
|
||||
printk(KERN_DEBUG "hostmixer: ioctl called\n");
|
||||
#endif
|
||||
|
||||
return(os_ioctl_generic(state->fd, cmd, arg));
|
||||
return os_ioctl_generic(state->fd, cmd, arg);
|
||||
}
|
||||
|
||||
static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
|
||||
@ -241,26 +242,29 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
|
||||
int ret;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostmixer: open called (host: %s)\n", mixer);
|
||||
printk(KERN_DEBUG "hostmixer: open called (host: %s)\n", mixer);
|
||||
#endif
|
||||
|
||||
state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
|
||||
if(state == NULL) return(-ENOMEM);
|
||||
if (state == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
if(file->f_mode & FMODE_READ) r = 1;
|
||||
if(file->f_mode & FMODE_WRITE) w = 1;
|
||||
if (file->f_mode & FMODE_READ)
|
||||
r = 1;
|
||||
if (file->f_mode & FMODE_WRITE)
|
||||
w = 1;
|
||||
|
||||
ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
|
||||
|
||||
if(ret < 0){
|
||||
printk("hostaudio_open_mixdev failed to open '%s', err = %d\n",
|
||||
dsp, -ret);
|
||||
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "
|
||||
"err = %d\n", dsp, -ret);
|
||||
kfree(state);
|
||||
return(ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
file->private_data = state;
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hostmixer_release(struct inode *inode, struct file *file)
|
||||
@ -268,13 +272,13 @@ static int hostmixer_release(struct inode *inode, struct file *file)
|
||||
struct hostmixer_state *state = file->private_data;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("hostmixer: release called\n");
|
||||
printk(KERN_DEBUG "hostmixer: release called\n");
|
||||
#endif
|
||||
|
||||
os_close_file(state->fd);
|
||||
kfree(state);
|
||||
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* kernel module operations */
|
||||
@ -314,13 +318,13 @@ static int __init hostaudio_init_module(void)
|
||||
dsp, mixer);
|
||||
|
||||
module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
|
||||
if(module_data.dev_audio < 0){
|
||||
if (module_data.dev_audio < 0) {
|
||||
printk(KERN_ERR "hostaudio: couldn't register DSP device!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
module_data.dev_mixer = register_sound_mixer(&hostmixer_fops, -1);
|
||||
if(module_data.dev_mixer < 0){
|
||||
if (module_data.dev_mixer < 0) {
|
||||
printk(KERN_ERR "hostmixer: couldn't register mixer "
|
||||
"device!\n");
|
||||
unregister_sound_dsp(module_data.dev_audio);
|
||||
|
||||
Reference in New Issue
Block a user