Skip to content

L
linux
Commit 476b8477 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: comedi: fix checkpatch.pl errors in comedi_fops.c 

There are still some >80 character lines in there, but
this catches the majority of the issues.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e0dcef71
Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 265 deletions
drivers/staging/comedi/comedi_fops.c
View file @ 476b8477
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
#include "comedidev.h" #include "comedidev.h"
#include <linux/cdev.h> #include <linux/cdev.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
//#include "kvmem.h" /* #include "kvmem.h" */
MODULE_AUTHOR("http://www.comedi.org"); MODULE_AUTHOR("http://www.comedi.org");
MODULE_DESCRIPTION("Comedi core module"); MODULE_DESCRIPTION("Comedi core module");
...@@ -60,42 +60,44 @@ module_param(comedi_debug, int, 0644); ...@@ -60,42 +60,44 @@ module_param(comedi_debug, int, 0644);
#endif #endif
static DEFINE_SPINLOCK(comedi_file_info_table_lock); static DEFINE_SPINLOCK(comedi_file_info_table_lock);
static struct comedi_device_file_info* comedi_file_info_table[COMEDI_NUM_MINORS]; static struct comedi_device_file_info
*comedi_file_info_table[COMEDI_NUM_MINORS];
static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg);
static int do_bufconfig_ioctl(comedi_device * dev, void *arg); static int do_devconfig_ioctl(comedi_device *dev, comedi_devconfig *arg);
static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg, static int do_bufconfig_ioctl(comedi_device *dev, void *arg);
struct file *file); static int do_devinfo_ioctl(comedi_device *dev, comedi_devinfo *arg,
static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg, struct file *file);
void *file); static int do_subdinfo_ioctl(comedi_device *dev, comedi_subdinfo *arg,
static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg); void *file);
static int do_bufinfo_ioctl(comedi_device * dev, void *arg); static int do_chaninfo_ioctl(comedi_device *dev, comedi_chaninfo *arg);
static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file); static int do_bufinfo_ioctl(comedi_device *dev, void *arg);
static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file); static int do_cmd_ioctl(comedi_device *dev, void *arg, void *file);
static int do_unlock_ioctl(comedi_device * dev, unsigned int arg, void *file); static int do_lock_ioctl(comedi_device *dev, unsigned int arg, void *file);
static int do_cancel_ioctl(comedi_device * dev, unsigned int arg, void *file); static int do_unlock_ioctl(comedi_device *dev, unsigned int arg, void *file);
static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file); static int do_cancel_ioctl(comedi_device *dev, unsigned int arg, void *file);
static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file); static int do_cmdtest_ioctl(comedi_device *dev, void *arg, void *file);
static int do_insn_ioctl(comedi_device * dev, void *arg, void *file); static int do_insnlist_ioctl(comedi_device *dev, void *arg, void *file);
static int do_poll_ioctl(comedi_device * dev, unsigned int subd, void *file); static int do_insn_ioctl(comedi_device *dev, void *arg, void *file);
static int do_poll_ioctl(comedi_device *dev, unsigned int subd, void *file);
void do_become_nonbusy(comedi_device * dev, comedi_subdevice * s);
static int do_cancel(comedi_device * dev, comedi_subdevice * s); extern void do_become_nonbusy(comedi_device *dev, comedi_subdevice *s);
static int do_cancel(comedi_device *dev, comedi_subdevice *s);
static int comedi_fasync(int fd, struct file *file, int on); static int comedi_fasync(int fd, struct file *file, int on);
static int is_device_busy(comedi_device * dev); static int is_device_busy(comedi_device *dev);
#ifdef HAVE_UNLOCKED_IOCTL #ifdef HAVE_UNLOCKED_IOCTL
static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
#else #else
static int comedi_ioctl(struct inode *inode, struct file *file, static int comedi_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
#endif #endif
{ {
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
int rc; int rc;
...@@ -162,7 +164,7 @@ static int comedi_ioctl(struct inode *inode, struct file *file, ...@@ -162,7 +164,7 @@ static int comedi_ioctl(struct inode *inode, struct file *file,
break; break;
} }
done: done:
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
return rc; return rc;
} }
...@@ -180,7 +182,7 @@ static int comedi_ioctl(struct inode *inode, struct file *file, ...@@ -180,7 +182,7 @@ static int comedi_ioctl(struct inode *inode, struct file *file,
writes: writes:
none none
*/ */
static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg) static int do_devconfig_ioctl(comedi_device *dev, comedi_devconfig *arg)
{ {
comedi_devconfig it; comedi_devconfig it;
int ret; int ret;
...@@ -193,8 +195,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg) ...@@ -193,8 +195,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg)
if (arg == NULL) { if (arg == NULL) {
if (is_device_busy(dev)) if (is_device_busy(dev))
return -EBUSY; return -EBUSY;
if(dev->attached) if (dev->attached) {
{
struct module *driver_module = dev->driver->module; struct module *driver_module = dev->driver->module;
comedi_device_detach(dev); comedi_device_detach(dev);
module_put(driver_module); module_put(driver_module);
...@@ -208,7 +209,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg) ...@@ -208,7 +209,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg)
it.board_name[COMEDI_NAMELEN - 1] = 0; it.board_name[COMEDI_NAMELEN - 1] = 0;
if (comedi_aux_data(it.options, 0) && if (comedi_aux_data(it.options, 0) &&
it.options[COMEDI_DEVCONF_AUX_DATA_LENGTH]) { it.options[COMEDI_DEVCONF_AUX_DATA_LENGTH]) {
int bit_shift; int bit_shift;
aux_len = it.options[COMEDI_DEVCONF_AUX_DATA_LENGTH]; aux_len = it.options[COMEDI_DEVCONF_AUX_DATA_LENGTH];
if (aux_len < 0) if (aux_len < 0)
...@@ -219,24 +220,23 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg) ...@@ -219,24 +220,23 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg)
return -ENOMEM; return -ENOMEM;
if (copy_from_user(aux_data, if (copy_from_user(aux_data,
comedi_aux_data(it.options, 0), aux_len)) { comedi_aux_data(it.options, 0), aux_len)) {
vfree(aux_data); vfree(aux_data);
return -EFAULT; return -EFAULT;
} }
it.options[COMEDI_DEVCONF_AUX_DATA_LO] = it.options[COMEDI_DEVCONF_AUX_DATA_LO] =
(unsigned long)aux_data; (unsigned long)aux_data;
if (sizeof(void *) > sizeof(int)) { if (sizeof(void *) > sizeof(int)) {
bit_shift = sizeof(int) * 8; bit_shift = sizeof(int) * 8;
it.options[COMEDI_DEVCONF_AUX_DATA_HI] = it.options[COMEDI_DEVCONF_AUX_DATA_HI] =
((unsigned long)aux_data) >> bit_shift; ((unsigned long)aux_data) >> bit_shift;
} else } else
it.options[COMEDI_DEVCONF_AUX_DATA_HI] = 0; it.options[COMEDI_DEVCONF_AUX_DATA_HI] = 0;
} }
ret = comedi_device_attach(dev, &it); ret = comedi_device_attach(dev, &it);
if(ret == 0) if (ret == 0) {
{ if (!try_module_get(dev->driver->module)) {
if(!try_module_get(dev->driver->module)) {
comedi_device_detach(dev); comedi_device_detach(dev);
return -ENOSYS; return -ENOSYS;
} }
...@@ -262,7 +262,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg) ...@@ -262,7 +262,7 @@ static int do_devconfig_ioctl(comedi_device * dev, comedi_devconfig * arg)
modified bufconfig at arg modified bufconfig at arg
*/ */
static int do_bufconfig_ioctl(comedi_device * dev, void *arg) static int do_bufconfig_ioctl(comedi_device *dev, void *arg)
{ {
comedi_bufconfig bc; comedi_bufconfig bc;
comedi_async *async; comedi_async *async;
...@@ -329,7 +329,7 @@ static int do_bufconfig_ioctl(comedi_device * dev, void *arg) ...@@ -329,7 +329,7 @@ static int do_bufconfig_ioctl(comedi_device * dev, void *arg)
bc.size = async->prealloc_bufsz; bc.size = async->prealloc_bufsz;
bc.maximum_size = async->max_bufsize; bc.maximum_size = async->max_bufsize;
copyback: copyback:
if (copy_to_user(arg, &bc, sizeof(comedi_bufconfig))) if (copy_to_user(arg, &bc, sizeof(comedi_bufconfig)))
return -EFAULT; return -EFAULT;
...@@ -350,14 +350,17 @@ static int do_bufconfig_ioctl(comedi_device * dev, void *arg) ...@@ -350,14 +350,17 @@ static int do_bufconfig_ioctl(comedi_device * dev, void *arg)
devinfo structure devinfo structure
*/ */
static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg, static int do_devinfo_ioctl(comedi_device *dev, comedi_devinfo *arg,
struct file *file) struct file *file)
{ {
comedi_devinfo devinfo; comedi_devinfo devinfo;
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_subdevice *read_subdev = comedi_get_read_subdevice(dev_file_info); comedi_get_device_file_info(minor);
comedi_subdevice *write_subdev = comedi_get_write_subdevice(dev_file_info); comedi_subdevice *read_subdev =
comedi_get_read_subdevice(dev_file_info);
comedi_subdevice *write_subdev =
comedi_get_write_subdevice(dev_file_info);
memset(&devinfo, 0, sizeof(devinfo)); memset(&devinfo, 0, sizeof(devinfo));
...@@ -367,16 +370,15 @@ static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg, ...@@ -367,16 +370,15 @@ static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg,
memcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN); memcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN);
memcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN); memcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN);
if (read_subdev) { if (read_subdev)
devinfo.read_subdevice = read_subdev - dev->subdevices; devinfo.read_subdevice = read_subdev - dev->subdevices;
} else { else
devinfo.read_subdevice = -1; devinfo.read_subdevice = -1;
}
if (write_subdev) { if (write_subdev)
devinfo.write_subdevice = write_subdev - dev->subdevices; devinfo.write_subdevice = write_subdev - dev->subdevices;
} else { else
devinfo.write_subdevice = -1; devinfo.write_subdevice = -1;
}
if (copy_to_user(arg, &devinfo, sizeof(comedi_devinfo))) if (copy_to_user(arg, &devinfo, sizeof(comedi_devinfo)))
return -EFAULT; return -EFAULT;
...@@ -398,8 +400,8 @@ static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg, ...@@ -398,8 +400,8 @@ static int do_devinfo_ioctl(comedi_device * dev, comedi_devinfo * arg,
array of subdevice info structures at arg array of subdevice info structures at arg
*/ */
static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg, static int do_subdinfo_ioctl(comedi_device *dev, comedi_subdinfo *arg,
void *file) void *file)
{ {
int ret, i; int ret, i;
comedi_subdinfo *tmp, *us; comedi_subdinfo *tmp, *us;
...@@ -425,8 +427,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg, ...@@ -425,8 +427,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg,
us->maxdata = s->maxdata; us->maxdata = s->maxdata;
if (s->range_table) { if (s->range_table) {
us->range_type = us->range_type =
(i << 24) | (0 << 16) | (s-> (i << 24) | (0 << 16) | (s->range_table->length);
range_table->length);
} else { } else {
us->range_type = 0; /* XXX */ us->range_type = 0; /* XXX */
} }
...@@ -458,7 +459,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg, ...@@ -458,7 +459,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg,
} }
ret = copy_to_user(arg, tmp, ret = copy_to_user(arg, tmp,
dev->n_subdevices * sizeof(comedi_subdinfo)); dev->n_subdevices * sizeof(comedi_subdinfo));
kfree(tmp); kfree(tmp);
...@@ -479,7 +480,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg, ...@@ -479,7 +480,7 @@ static int do_subdinfo_ioctl(comedi_device * dev, comedi_subdinfo * arg,
arrays at elements of chaninfo structure arrays at elements of chaninfo structure
*/ */
static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg) static int do_chaninfo_ioctl(comedi_device *dev, comedi_chaninfo *arg)
{ {
comedi_subdevice *s; comedi_subdevice *s;
comedi_chaninfo it; comedi_chaninfo it;
...@@ -495,7 +496,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg) ...@@ -495,7 +496,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg)
if (s->maxdata || !s->maxdata_list) if (s->maxdata || !s->maxdata_list)
return -EINVAL; return -EINVAL;
if (copy_to_user(it.maxdata_list, s->maxdata_list, if (copy_to_user(it.maxdata_list, s->maxdata_list,
s->n_chan * sizeof(lsampl_t))) s->n_chan * sizeof(lsampl_t)))
return -EFAULT; return -EFAULT;
} }
...@@ -503,7 +504,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg) ...@@ -503,7 +504,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg)
if (!s->flaglist) if (!s->flaglist)
return -EINVAL; return -EINVAL;
if (copy_to_user(it.flaglist, s->flaglist, if (copy_to_user(it.flaglist, s->flaglist,
s->n_chan * sizeof(unsigned int))) s->n_chan * sizeof(unsigned int)))
return -EFAULT; return -EFAULT;
} }
...@@ -516,11 +517,14 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg) ...@@ -516,11 +517,14 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg)
int x; int x;
x = (dev->minor << 28) | (it.subdev << 24) | (i << 16) | x = (dev->minor << 28) | (it.subdev << 24) | (i << 16) |
(s->range_table_list[i]->length); (s->range_table_list[i]->length);
put_user(x, it.rangelist + i); put_user(x, it.rangelist + i);
} }
//if(copy_to_user(it.rangelist,s->range_type_list,s->n_chan*sizeof(unsigned int))) #if 0
// return -EFAULT; if (copy_to_user(it.rangelist, s->range_type_list,
s->n_chan*sizeof(unsigned int)))
return -EFAULT;
#endif
} }
return 0; return 0;
...@@ -540,7 +544,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg) ...@@ -540,7 +544,7 @@ static int do_chaninfo_ioctl(comedi_device * dev, comedi_chaninfo * arg)
modified bufinfo at arg modified bufinfo at arg
*/ */
static int do_bufinfo_ioctl(comedi_device * dev, void *arg) static int do_bufinfo_ioctl(comedi_device *dev, void *arg)
{ {
comedi_bufinfo bi; comedi_bufinfo bi;
comedi_subdevice *s; comedi_subdevice *s;
...@@ -569,15 +573,15 @@ static int do_bufinfo_ioctl(comedi_device * dev, void *arg) ...@@ -569,15 +573,15 @@ static int do_bufinfo_ioctl(comedi_device * dev, void *arg)
comedi_buf_read_free(async, bi.bytes_read); comedi_buf_read_free(async, bi.bytes_read);
if (!(comedi_get_subdevice_runflags(s) & (SRF_ERROR | if (!(comedi_get_subdevice_runflags(s) & (SRF_ERROR |
SRF_RUNNING)) SRF_RUNNING))
&& async->buf_write_count == async->buf_read_count) { && async->buf_write_count == async->buf_read_count) {
do_become_nonbusy(dev, s); do_become_nonbusy(dev, s);
} }
} }
if (bi.bytes_written && (s->subdev_flags & SDF_CMD_WRITE)) { if (bi.bytes_written && (s->subdev_flags & SDF_CMD_WRITE)) {
bi.bytes_written = bi.bytes_written =
comedi_buf_write_alloc(async, bi.bytes_written); comedi_buf_write_alloc(async, bi.bytes_written);
comedi_buf_write_free(async, bi.bytes_written); comedi_buf_write_free(async, bi.bytes_written);
} }
...@@ -586,15 +590,15 @@ static int do_bufinfo_ioctl(comedi_device * dev, void *arg) ...@@ -586,15 +590,15 @@ static int do_bufinfo_ioctl(comedi_device * dev, void *arg)
bi.buf_read_count = async->buf_read_count; bi.buf_read_count = async->buf_read_count;
bi.buf_read_ptr = async->buf_read_ptr; bi.buf_read_ptr = async->buf_read_ptr;
copyback: copyback:
if (copy_to_user(arg, &bi, sizeof(comedi_bufinfo))) if (copy_to_user(arg, &bi, sizeof(comedi_bufinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, static int parse_insn(comedi_device *dev, comedi_insn *insn, lsampl_t *data,
void *file); void *file);
/* /*
* COMEDI_INSNLIST * COMEDI_INSNLIST
* synchronous instructions * synchronous instructions
...@@ -612,7 +616,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, ...@@ -612,7 +616,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data,
*/ */
/* arbitrary limits */ /* arbitrary limits */
#define MAX_SAMPLES 256 #define MAX_SAMPLES 256
static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file) static int do_insnlist_ioctl(comedi_device *dev, void *arg, void *file)
{ {
comedi_insnlist insnlist; comedi_insnlist insnlist;
comedi_insn *insns = NULL; comedi_insn *insns = NULL;
...@@ -638,7 +642,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -638,7 +642,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file)
} }
if (copy_from_user(insns, insnlist.insns, if (copy_from_user(insns, insnlist.insns,
sizeof(comedi_insn) * insnlist.n_insns)) { sizeof(comedi_insn) * insnlist.n_insns)) {
DPRINTK("copy_from_user failed\n"); DPRINTK("copy_from_user failed\n");
ret = -EFAULT; ret = -EFAULT;
goto error; goto error;
...@@ -652,7 +656,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -652,7 +656,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file)
} }
if (insns[i].insn & INSN_MASK_WRITE) { if (insns[i].insn & INSN_MASK_WRITE) {
if (copy_from_user(data, insns[i].data, if (copy_from_user(data, insns[i].data,
insns[i].n * sizeof(lsampl_t))) { insns[i].n * sizeof(lsampl_t))) {
DPRINTK("copy_from_user failed\n"); DPRINTK("copy_from_user failed\n");
ret = -EFAULT; ret = -EFAULT;
goto error; goto error;
...@@ -663,7 +667,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -663,7 +667,7 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file)
goto error; goto error;
if (insns[i].insn & INSN_MASK_READ) { if (insns[i].insn & INSN_MASK_READ) {
if (copy_to_user(insns[i].data, data, if (copy_to_user(insns[i].data, data,
insns[i].n * sizeof(lsampl_t))) { insns[i].n * sizeof(lsampl_t))) {
DPRINTK("copy_to_user failed\n"); DPRINTK("copy_to_user failed\n");
ret = -EFAULT; ret = -EFAULT;
goto error; goto error;
...@@ -673,20 +677,19 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -673,20 +677,19 @@ static int do_insnlist_ioctl(comedi_device * dev, void *arg, void *file)
schedule(); schedule();
} }
error: error:
if (insns) kfree(insns);
kfree(insns); kfree(data);
if (data)
kfree(data);
if (ret < 0) if (ret < 0)
return ret; return ret;
return i; return i;
} }
static int check_insn_config_length(comedi_insn * insn, lsampl_t * data) static int check_insn_config_length(comedi_insn *insn, lsampl_t *data)
{ {
if(insn->n < 1) return -EINVAL; if (insn->n < 1)
return -EINVAL;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_DIO_OUTPUT: case INSN_CONFIG_DIO_OUTPUT:
...@@ -730,21 +733,22 @@ static int check_insn_config_length(comedi_insn * insn, lsampl_t * data) ...@@ -730,21 +733,22 @@ static int check_insn_config_length(comedi_insn * insn, lsampl_t * data)
if (insn->n == 5) if (insn->n == 5)
return 0; return 0;
break; break;
//by default we allow the insn since we don't have checks for all possible cases yet /* by default we allow the insn since we don't have checks for
* all possible cases yet */
default: default:
rt_printk rt_printk("comedi: no check for data length of config insn id "
("comedi: no check for data length of config insn id %i is implemented.\n" "%i is implemented.\n"
" Add a check to %s in %s.\n" " Add a check to %s in %s.\n"
" Assuming n=%i is correct.\n", data[0], __FUNCTION__, " Assuming n=%i is correct.\n", data[0], __func__,
__FILE__, insn->n); __FILE__, insn->n);
return 0; return 0;
break; break;
} }
return -EINVAL; return -EINVAL;
} }
static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, static int parse_insn(comedi_device *dev, comedi_insn *insn, lsampl_t *data,
void *file) void *file)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret = 0; int ret = 0;
...@@ -833,7 +837,8 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, ...@@ -833,7 +837,8 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data,
goto out; goto out;
} }
if ((ret = check_chanlist(s, 1, &insn->chanspec)) < 0) { ret = check_chanlist(s, 1, &insn->chanspec);
if (ret < 0) {
ret = -EINVAL; ret = -EINVAL;
DPRINTK("bad chanspec\n"); DPRINTK("bad chanspec\n");
goto out; goto out;
...@@ -851,8 +856,8 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, ...@@ -851,8 +856,8 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data,
break; break;
case INSN_WRITE: case INSN_WRITE:
maxdata = s->maxdata_list maxdata = s->maxdata_list
? s->maxdata_list[CR_CHAN(insn->chanspec)] ? s->maxdata_list[CR_CHAN(insn->chanspec)]
: s->maxdata; : s->maxdata;
for (i = 0; i < insn->n; ++i) { for (i = 0; i < insn->n; ++i) {
if (data[i] > maxdata) { if (data[i] > maxdata) {
ret = -EINVAL; ret = -EINVAL;
...@@ -884,7 +889,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, ...@@ -884,7 +889,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data,
s->busy = NULL; s->busy = NULL;
} }
out: out:
return ret; return ret;
} }
...@@ -902,7 +907,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data, ...@@ -902,7 +907,7 @@ static int parse_insn(comedi_device * dev, comedi_insn * insn, lsampl_t * data,
* writes: * writes:
* data (for reads) * data (for reads)
*/ */
static int do_insn_ioctl(comedi_device * dev, void *arg, void *file) static int do_insn_ioctl(comedi_device *dev, void *arg, void *file)
{ {
comedi_insn insn; comedi_insn insn;
lsampl_t *data = NULL; lsampl_t *data = NULL;
...@@ -939,9 +944,8 @@ static int do_insn_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -939,9 +944,8 @@ static int do_insn_ioctl(comedi_device * dev, void *arg, void *file)
} }
ret = insn.n; ret = insn.n;
error: error:
if (data) kfree(data);
kfree(data);
return ret; return ret;
} }
...@@ -961,7 +965,7 @@ static int do_insn_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -961,7 +965,7 @@ static int do_insn_ioctl(comedi_device * dev, void *arg, void *file)
modified cmd structure at arg modified cmd structure at arg
*/ */
static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) static int do_cmd_ioctl(comedi_device *dev, void *arg, void *file)
{ {
comedi_cmd user_cmd; comedi_cmd user_cmd;
comedi_subdevice *s; comedi_subdevice *s;
...@@ -973,7 +977,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -973,7 +977,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
DPRINTK("bad cmd address\n"); DPRINTK("bad cmd address\n");
return -EFAULT; return -EFAULT;
} }
// save user's chanlist pointer so it can be restored later /* save user's chanlist pointer so it can be restored later */
chanlist_saver = user_cmd.chanlist; chanlist_saver = user_cmd.chanlist;
if (user_cmd.subdev >= dev->n_subdevices) { if (user_cmd.subdev >= dev->n_subdevices) {
...@@ -1024,13 +1028,12 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1024,13 +1028,12 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
goto cleanup; goto cleanup;
} }
if (async->cmd.chanlist) kfree(async->cmd.chanlist);
kfree(async->cmd.chanlist);
async->cmd = user_cmd; async->cmd = user_cmd;
async->cmd.data = NULL; async->cmd.data = NULL;
/* load channel/gain list */ /* load channel/gain list */
async->cmd.chanlist = async->cmd.chanlist =
kmalloc(async->cmd.chanlist_len * sizeof(int), GFP_KERNEL); kmalloc(async->cmd.chanlist_len * sizeof(int), GFP_KERNEL);
if (!async->cmd.chanlist) { if (!async->cmd.chanlist) {
DPRINTK("allocation failed\n"); DPRINTK("allocation failed\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1038,15 +1041,15 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1038,15 +1041,15 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
} }
if (copy_from_user(async->cmd.chanlist, user_cmd.chanlist, if (copy_from_user(async->cmd.chanlist, user_cmd.chanlist,
async->cmd.chanlist_len * sizeof(int))) { async->cmd.chanlist_len * sizeof(int))) {
DPRINTK("fault reading chanlist\n"); DPRINTK("fault reading chanlist\n");
ret = -EFAULT; ret = -EFAULT;
goto cleanup; goto cleanup;
} }
/* make sure each element in channel/gain list is valid */ /* make sure each element in channel/gain list is valid */
if ((ret = check_chanlist(s, async->cmd.chanlist_len, ret = check_chanlist(s, async->cmd.chanlist_len, async->cmd.chanlist);
async->cmd.chanlist)) < 0) { if (ret < 0) {
DPRINTK("bad chanlist\n"); DPRINTK("bad chanlist\n");
goto cleanup; goto cleanup;
} }
...@@ -1056,7 +1059,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1056,7 +1059,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
if (async->cmd.flags & TRIG_BOGUS || ret) { if (async->cmd.flags & TRIG_BOGUS || ret) {
DPRINTK("test returned %d\n", ret); DPRINTK("test returned %d\n", ret);
user_cmd = async->cmd; user_cmd = async->cmd;
// restore chanlist pointer before copying back /* restore chanlist pointer before copying back */
user_cmd.chanlist = chanlist_saver; user_cmd.chanlist = chanlist_saver;
user_cmd.data = NULL; user_cmd.data = NULL;
if (copy_to_user(arg, &user_cmd, sizeof(comedi_cmd))) { if (copy_to_user(arg, &user_cmd, sizeof(comedi_cmd))) {
...@@ -1077,11 +1080,10 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1077,11 +1080,10 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
comedi_reset_async_buf(async); comedi_reset_async_buf(async);
async->cb_mask = async->cb_mask =
COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR | COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR |
COMEDI_CB_OVERFLOW; COMEDI_CB_OVERFLOW;
if (async->cmd.flags & TRIG_WAKE_EOS) { if (async->cmd.flags & TRIG_WAKE_EOS)
async->cb_mask |= COMEDI_CB_EOS; async->cb_mask |= COMEDI_CB_EOS;
}
comedi_set_subdevice_runflags(s, ~0, SRF_USER | SRF_RUNNING); comedi_set_subdevice_runflags(s, ~0, SRF_USER | SRF_RUNNING);
...@@ -1096,7 +1098,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1096,7 +1098,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
if (ret == 0) if (ret == 0)
return 0; return 0;
cleanup: cleanup:
do_become_nonbusy(dev, s); do_become_nonbusy(dev, s);
return ret; return ret;
...@@ -1117,7 +1119,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1117,7 +1119,7 @@ static int do_cmd_ioctl(comedi_device * dev, void *arg, void *file)
modified cmd structure at arg modified cmd structure at arg
*/ */
static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) static int do_cmdtest_ioctl(comedi_device *dev, void *arg, void *file)
{ {
comedi_cmd user_cmd; comedi_cmd user_cmd;
comedi_subdevice *s; comedi_subdevice *s;
...@@ -1129,7 +1131,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1129,7 +1131,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
DPRINTK("bad cmd address\n"); DPRINTK("bad cmd address\n");
return -EFAULT; return -EFAULT;
} }
// save user's chanlist pointer so it can be restored later /* save user's chanlist pointer so it can be restored later */
chanlist_saver = user_cmd.chanlist; chanlist_saver = user_cmd.chanlist;
if (user_cmd.subdev >= dev->n_subdevices) { if (user_cmd.subdev >= dev->n_subdevices) {
...@@ -1160,8 +1162,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1160,8 +1162,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
/* load channel/gain list */ /* load channel/gain list */
if (user_cmd.chanlist) { if (user_cmd.chanlist) {
chanlist = chanlist =
kmalloc(user_cmd.chanlist_len * sizeof(int), kmalloc(user_cmd.chanlist_len * sizeof(int), GFP_KERNEL);
GFP_KERNEL);
if (!chanlist) { if (!chanlist) {
DPRINTK("allocation failed\n"); DPRINTK("allocation failed\n");
ret = -ENOMEM; ret = -ENOMEM;
...@@ -1169,15 +1170,15 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1169,15 +1170,15 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
} }
if (copy_from_user(chanlist, user_cmd.chanlist, if (copy_from_user(chanlist, user_cmd.chanlist,
user_cmd.chanlist_len * sizeof(int))) { user_cmd.chanlist_len * sizeof(int))) {
DPRINTK("fault reading chanlist\n"); DPRINTK("fault reading chanlist\n");
ret = -EFAULT; ret = -EFAULT;
goto cleanup; goto cleanup;
} }
/* make sure each element in channel/gain list is valid */ /* make sure each element in channel/gain list is valid */
if ((ret = check_chanlist(s, user_cmd.chanlist_len, ret = check_chanlist(s, user_cmd.chanlist_len, chanlist);
chanlist)) < 0) { if (ret < 0) {
DPRINTK("bad chanlist\n"); DPRINTK("bad chanlist\n");
goto cleanup; goto cleanup;
} }
...@@ -1187,7 +1188,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1187,7 +1188,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
ret = s->do_cmdtest(dev, s, &user_cmd); ret = s->do_cmdtest(dev, s, &user_cmd);
// restore chanlist pointer before copying back /* restore chanlist pointer before copying back */
user_cmd.chanlist = chanlist_saver; user_cmd.chanlist = chanlist_saver;
if (copy_to_user(arg, &user_cmd, sizeof(comedi_cmd))) { if (copy_to_user(arg, &user_cmd, sizeof(comedi_cmd))) {
...@@ -1195,9 +1196,8 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1195,9 +1196,8 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
ret = -EFAULT; ret = -EFAULT;
goto cleanup; goto cleanup;
} }
cleanup: cleanup:
if (chanlist) kfree(chanlist);
kfree(chanlist);
return ret; return ret;
} }
...@@ -1217,7 +1217,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file) ...@@ -1217,7 +1217,7 @@ static int do_cmdtest_ioctl(comedi_device * dev, void *arg, void *file)
*/ */
static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file) static int do_lock_ioctl(comedi_device *dev, unsigned int arg, void *file)
{ {
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
...@@ -1228,11 +1228,10 @@ static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file) ...@@ -1228,11 +1228,10 @@ static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file)
s = dev->subdevices + arg; s = dev->subdevices + arg;
comedi_spin_lock_irqsave(&s->spin_lock, flags); comedi_spin_lock_irqsave(&s->spin_lock, flags);
if (s->busy || s->lock) { if (s->busy || s->lock)
ret = -EBUSY; ret = -EBUSY;
} else { else
s->lock = file; s->lock = file;
}
comedi_spin_unlock_irqrestore(&s->spin_lock, flags); comedi_spin_unlock_irqrestore(&s->spin_lock, flags);
if (ret < 0) if (ret < 0)
...@@ -1262,7 +1261,7 @@ static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file) ...@@ -1262,7 +1261,7 @@ static int do_lock_ioctl(comedi_device * dev, unsigned int arg, void *file)
This function isn't protected by the semaphore, since This function isn't protected by the semaphore, since
we already own the lock. we already own the lock.
*/ */
static int do_unlock_ioctl(comedi_device * dev, unsigned int arg, void *file) static int do_unlock_ioctl(comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; comedi_subdevice *s;
...@@ -1302,7 +1301,7 @@ static int do_unlock_ioctl(comedi_device * dev, unsigned int arg, void *file) ...@@ -1302,7 +1301,7 @@ static int do_unlock_ioctl(comedi_device * dev, unsigned int arg, void *file)
nothing nothing
*/ */
static int do_cancel_ioctl(comedi_device * dev, unsigned int arg, void *file) static int do_cancel_ioctl(comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; comedi_subdevice *s;
...@@ -1338,7 +1337,7 @@ static int do_cancel_ioctl(comedi_device * dev, unsigned int arg, void *file) ...@@ -1338,7 +1337,7 @@ static int do_cancel_ioctl(comedi_device * dev, unsigned int arg, void *file)
nothing nothing
*/ */
static int do_poll_ioctl(comedi_device * dev, unsigned int arg, void *file) static int do_poll_ioctl(comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; comedi_subdevice *s;
...@@ -1361,7 +1360,7 @@ static int do_poll_ioctl(comedi_device * dev, unsigned int arg, void *file) ...@@ -1361,7 +1360,7 @@ static int do_poll_ioctl(comedi_device * dev, unsigned int arg, void *file)
return -EINVAL; return -EINVAL;
} }
static int do_cancel(comedi_device * dev, comedi_subdevice * s) static int do_cancel(comedi_device *dev, comedi_subdevice *s)
{ {
int ret = 0; int ret = 0;
...@@ -1387,13 +1386,14 @@ void comedi_unmap(struct vm_area_struct *area) ...@@ -1387,13 +1386,14 @@ void comedi_unmap(struct vm_area_struct *area)
} }
static struct vm_operations_struct comedi_vm_ops = { static struct vm_operations_struct comedi_vm_ops = {
close:comedi_unmap, .close = comedi_unmap,
}; };
static int comedi_mmap(struct file *file, struct vm_area_struct *vma) static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
{ {
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
comedi_async *async = NULL; comedi_async *async = NULL;
unsigned long start = vma->vm_start; unsigned long start = vma->vm_start;
...@@ -1409,11 +1409,11 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1409,11 +1409,11 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
retval = -ENODEV; retval = -ENODEV;
goto done; goto done;
} }
if (vma->vm_flags & VM_WRITE) { if (vma->vm_flags & VM_WRITE)
s = comedi_get_write_subdevice(dev_file_info); s = comedi_get_write_subdevice(dev_file_info);
} else { else
s = comedi_get_read_subdevice(dev_file_info); s = comedi_get_read_subdevice(dev_file_info);
}
if (s == NULL) { if (s == NULL) {
retval = -EINVAL; retval = -EINVAL;
goto done; goto done;
...@@ -1443,9 +1443,10 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1443,9 +1443,10 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
n_pages = size >> PAGE_SHIFT; n_pages = size >> PAGE_SHIFT;
for (i = 0; i < n_pages; ++i) { for (i = 0; i < n_pages; ++i) {
if (remap_pfn_range(vma, start, if (remap_pfn_range(vma, start,
page_to_pfn(virt_to_page(async-> page_to_pfn(virt_to_page(async->
buf_page_list[i].virt_addr)), buf_page_list[i].
PAGE_SIZE, PAGE_SHARED)) { virt_addr)),
PAGE_SIZE, PAGE_SHARED)) {
retval = -EAGAIN; retval = -EAGAIN;
goto done; goto done;
} }
...@@ -1458,16 +1459,17 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1458,16 +1459,17 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
async->mmap_count++; async->mmap_count++;
retval = 0; retval = 0;
done: done:
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
return retval; return retval;
} }
static unsigned int comedi_poll(struct file *file, poll_table * wait) static unsigned int comedi_poll(struct file *file, poll_table *wait)
{ {
unsigned int mask = 0; unsigned int mask = 0;
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
comedi_subdevice *read_subdev; comedi_subdevice *read_subdev;
comedi_subdevice *write_subdev; comedi_subdevice *write_subdev;
...@@ -1484,21 +1486,22 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait) ...@@ -1484,21 +1486,22 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)
if (read_subdev) { if (read_subdev) {
poll_wait(file, &read_subdev->async->wait_head, wait); poll_wait(file, &read_subdev->async->wait_head, wait);
if (!read_subdev->busy if (!read_subdev->busy
|| comedi_buf_read_n_available(read_subdev->async) > 0 || comedi_buf_read_n_available(read_subdev->async) > 0
|| !(comedi_get_subdevice_runflags(read_subdev) & || !(comedi_get_subdevice_runflags(read_subdev) &
SRF_RUNNING)) { SRF_RUNNING)) {
mask |= POLLIN | POLLRDNORM; mask |= POLLIN | POLLRDNORM;
} }
} }
write_subdev = comedi_get_write_subdevice(dev_file_info); write_subdev = comedi_get_write_subdevice(dev_file_info);
if (write_subdev) { if (write_subdev) {
poll_wait(file, &write_subdev->async->wait_head, wait); poll_wait(file, &write_subdev->async->wait_head, wait);
comedi_buf_write_alloc(write_subdev->async, write_subdev->async->prealloc_bufsz); comedi_buf_write_alloc(write_subdev->async,
write_subdev->async->prealloc_bufsz);
if (!write_subdev->busy if (!write_subdev->busy
|| !(comedi_get_subdevice_runflags(write_subdev) & || !(comedi_get_subdevice_runflags(write_subdev) &
SRF_RUNNING) SRF_RUNNING)
|| comedi_buf_write_n_allocated(write_subdev->async) >= || comedi_buf_write_n_allocated(write_subdev->async) >=
bytes_per_sample(write_subdev->async->subdevice)) { bytes_per_sample(write_subdev->async->subdevice)) {
mask |= POLLOUT | POLLWRNORM; mask |= POLLOUT | POLLWRNORM;
} }
} }
...@@ -1508,14 +1511,15 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait) ...@@ -1508,14 +1511,15 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)
} }
static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
loff_t * offset) loff_t *offset)
{ {
comedi_subdevice *s; comedi_subdevice *s;
comedi_async *async; comedi_async *async;
int n, m, count = 0, retval = 0; int n, m, count = 0, retval = 0;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
if (!dev->attached) { if (!dev->attached) {
...@@ -1550,20 +1554,18 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, ...@@ -1550,20 +1554,18 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
n = nbytes; n = nbytes;
m = n; m = n;
if (async->buf_write_ptr + m > async->prealloc_bufsz) { if (async->buf_write_ptr + m > async->prealloc_bufsz)
m = async->prealloc_bufsz - async->buf_write_ptr; m = async->prealloc_bufsz - async->buf_write_ptr;
}
comedi_buf_write_alloc(async, async->prealloc_bufsz); comedi_buf_write_alloc(async, async->prealloc_bufsz);
if (m > comedi_buf_write_n_allocated(async)) { if (m > comedi_buf_write_n_allocated(async))
m = comedi_buf_write_n_allocated(async); m = comedi_buf_write_n_allocated(async);
}
if (m < n) if (m < n)
n = m; n = m;
if (n == 0) { if (n == 0) {
if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) { if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) {
if (comedi_get_subdevice_runflags(s) & if (comedi_get_subdevice_runflags(s) &
SRF_ERROR) { SRF_ERROR) {
retval = -EPIPE; retval = -EPIPE;
} else { } else {
retval = 0; retval = 0;
...@@ -1580,9 +1582,8 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, ...@@ -1580,9 +1582,8 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
break; break;
} }
schedule(); schedule();
if (!s->busy) { if (!s->busy)
break; break;
}
if (s->busy != file) { if (s->busy != file) {
retval = -EACCES; retval = -EACCES;
break; break;
...@@ -1591,7 +1592,7 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, ...@@ -1591,7 +1592,7 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
} }
m = copy_from_user(async->prealloc_buf + async->buf_write_ptr, m = copy_from_user(async->prealloc_buf + async->buf_write_ptr,
buf, n); buf, n);
if (m) { if (m) {
n -= m; n -= m;
retval = -EFAULT; retval = -EFAULT;
...@@ -1608,18 +1609,19 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, ...@@ -1608,18 +1609,19 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
remove_wait_queue(&async->wait_head, &wait); remove_wait_queue(&async->wait_head, &wait);
done: done:
return (count ? count : retval); return count ? count : retval;
} }
static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
loff_t * offset) loff_t *offset)
{ {
comedi_subdevice *s; comedi_subdevice *s;
comedi_async *async; comedi_async *async;
int n, m, count = 0, retval = 0; int n, m, count = 0, retval = 0;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
if (!dev->attached) { if (!dev->attached) {
...@@ -1654,11 +1656,10 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, ...@@ -1654,11 +1656,10 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
n = nbytes; n = nbytes;
m = comedi_buf_read_n_available(async); m = comedi_buf_read_n_available(async);
//printk("%d available\n",m); /* printk("%d available\n",m); */
if (async->buf_read_ptr + m > async->prealloc_bufsz) { if (async->buf_read_ptr + m > async->prealloc_bufsz)
m = async->prealloc_bufsz - async->buf_read_ptr; m = async->prealloc_bufsz - async->buf_read_ptr;
} /* printk("%d contiguous\n",m); */
//printk("%d contiguous\n",m);
if (m < n) if (m < n)
n = m; n = m;
...@@ -1666,7 +1667,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, ...@@ -1666,7 +1667,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) { if (!(comedi_get_subdevice_runflags(s) & SRF_RUNNING)) {
do_become_nonbusy(dev, s); do_become_nonbusy(dev, s);
if (comedi_get_subdevice_runflags(s) & if (comedi_get_subdevice_runflags(s) &
SRF_ERROR) { SRF_ERROR) {
retval = -EPIPE; retval = -EPIPE;
} else { } else {
retval = 0; retval = 0;
...@@ -1693,7 +1694,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, ...@@ -1693,7 +1694,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
continue; continue;
} }
m = copy_to_user(buf, async->prealloc_buf + m = copy_to_user(buf, async->prealloc_buf +
async->buf_read_ptr, n); async->buf_read_ptr, n);
if (m) { if (m) {
n -= m; n -= m;
retval = -EFAULT; retval = -EFAULT;
...@@ -1709,20 +1710,20 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, ...@@ -1709,20 +1710,20 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
break; /* makes device work like a pipe */ break; /* makes device work like a pipe */
} }
if (!(comedi_get_subdevice_runflags(s) & (SRF_ERROR | SRF_RUNNING)) && if (!(comedi_get_subdevice_runflags(s) & (SRF_ERROR | SRF_RUNNING)) &&
async->buf_read_count - async->buf_write_count == 0) { async->buf_read_count - async->buf_write_count == 0) {
do_become_nonbusy(dev, s); do_become_nonbusy(dev, s);
} }
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
remove_wait_queue(&async->wait_head, &wait); remove_wait_queue(&async->wait_head, &wait);
done: done:
return (count ? count : retval); return count ? count : retval;
} }
/* /*
This function restores a subdevice to an idle state. This function restores a subdevice to an idle state.
*/ */
void do_become_nonbusy(comedi_device * dev, comedi_subdevice * s) void do_become_nonbusy(comedi_device *dev, comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
...@@ -1737,7 +1738,8 @@ void do_become_nonbusy(comedi_device * dev, comedi_subdevice * s) ...@@ -1737,7 +1738,8 @@ void do_become_nonbusy(comedi_device * dev, comedi_subdevice * s)
comedi_reset_async_buf(async); comedi_reset_async_buf(async);
async->inttrig = NULL; async->inttrig = NULL;
} else { } else {
printk("BUG: (?) do_become_nonbusy called with async=0\n"); printk(KERN_ERR
"BUG: (?) do_become_nonbusy called with async=0\n");
} }
s->busy = NULL; s->busy = NULL;
...@@ -1747,7 +1749,8 @@ static int comedi_open(struct inode *inode, struct file *file) ...@@ -1747,7 +1749,8 @@ static int comedi_open(struct inode *inode, struct file *file)
{ {
char mod[32]; char mod[32];
const unsigned minor = iminor(inode); const unsigned minor = iminor(inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
if (dev == NULL) { if (dev == NULL) {
DPRINTK("invalid minor number\n"); DPRINTK("invalid minor number\n");
...@@ -1805,9 +1808,8 @@ static int comedi_open(struct inode *inode, struct file *file) ...@@ -1805,9 +1808,8 @@ static int comedi_open(struct inode *inode, struct file *file)
} }
} }
if (dev->attached && dev->use_count == 0 && dev->open) { if (dev->attached && dev->use_count == 0 && dev->open)
dev->open(dev); dev->open(dev);
}
dev->use_count++; dev->use_count++;
...@@ -1819,7 +1821,8 @@ static int comedi_open(struct inode *inode, struct file *file) ...@@ -1819,7 +1821,8 @@ static int comedi_open(struct inode *inode, struct file *file)
static int comedi_close(struct inode *inode, struct file *file) static int comedi_close(struct inode *inode, struct file *file)
{ {
const unsigned minor = iminor(inode); const unsigned minor = iminor(inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
comedi_subdevice *s = NULL; comedi_subdevice *s = NULL;
int i; int i;
...@@ -1830,30 +1833,25 @@ static int comedi_close(struct inode *inode, struct file *file) ...@@ -1830,30 +1833,25 @@ static int comedi_close(struct inode *inode, struct file *file)
for (i = 0; i < dev->n_subdevices; i++) { for (i = 0; i < dev->n_subdevices; i++) {
s = dev->subdevices + i; s = dev->subdevices + i;
if (s->busy == file) { if (s->busy == file)
do_cancel(dev, s); do_cancel(dev, s);
} if (s->lock == file)
if (s->lock == file) {
s->lock = NULL; s->lock = NULL;
}
} }
} }
if (dev->attached && dev->use_count == 1 && dev->close) { if (dev->attached && dev->use_count == 1 && dev->close)
dev->close(dev); dev->close(dev);
}
module_put(THIS_MODULE); module_put(THIS_MODULE);
if (dev->attached) { if (dev->attached)
module_put(dev->driver->module); module_put(dev->driver->module);
}
dev->use_count--; dev->use_count--;
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
if (file->f_flags & FASYNC) { if (file->f_flags & FASYNC)
comedi_fasync(-1, file, 0); comedi_fasync(-1, file, 0);
}
return 0; return 0;
} }
...@@ -1861,40 +1859,42 @@ static int comedi_close(struct inode *inode, struct file *file) ...@@ -1861,40 +1859,42 @@ static int comedi_close(struct inode *inode, struct file *file)
static int comedi_fasync(int fd, struct file *file, int on) static int comedi_fasync(int fd, struct file *file, int on)
{ {
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(minor); struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor);
comedi_device *dev = dev_file_info->device; comedi_device *dev = dev_file_info->device;
return fasync_helper(fd, file, on, &dev->async_queue); return fasync_helper(fd, file, on, &dev->async_queue);
} }
const struct file_operations comedi_fops = { const struct file_operations comedi_fops = {
owner:THIS_MODULE, .owner = THIS_MODULE,
#ifdef HAVE_UNLOCKED_IOCTL #ifdef HAVE_UNLOCKED_IOCTL
unlocked_ioctl:comedi_unlocked_ioctl, .unlocked_ioctl = comedi_unlocked_ioctl,
#else #else
ioctl:comedi_ioctl, .ioctl = comedi_ioctl,
#endif #endif
#ifdef HAVE_COMPAT_IOCTL #ifdef HAVE_COMPAT_IOCTL
compat_ioctl:comedi_compat_ioctl, .compat_ioctl = comedi_compat_ioctl,
#endif #endif
open:comedi_open, .open = comedi_open,
release:comedi_close, .release = comedi_close,
read:comedi_read, .read = comedi_read,
write:comedi_write, .write = comedi_write,
mmap:comedi_mmap, .mmap = comedi_mmap,
poll:comedi_poll, .poll = comedi_poll,
fasync:comedi_fasync, .fasync = comedi_fasync,
}; };
struct class *comedi_class = NULL; struct class *comedi_class;
static struct cdev comedi_cdev; static struct cdev comedi_cdev;
static void comedi_cleanup_legacy_minors(void) static void comedi_cleanup_legacy_minors(void)
{ {
unsigned i; unsigned i;
for (i = 0; i < COMEDI_NUM_LEGACY_MINORS; i++) {
for (i = 0; i < COMEDI_NUM_LEGACY_MINORS; i++)
comedi_free_board_minor(i); comedi_free_board_minor(i);
}
} }
static int __init comedi_init(void) static int __init comedi_init(void)
...@@ -1902,13 +1902,14 @@ static int __init comedi_init(void) ...@@ -1902,13 +1902,14 @@ static int __init comedi_init(void)
int i; int i;
int retval; int retval;
printk("comedi: version " COMEDI_RELEASE printk(KERN_INFO "comedi: version " COMEDI_RELEASE
" - http://www.comedi.org\n"); " - http://www.comedi.org\n");
memset(comedi_file_info_table, 0, sizeof(struct comedi_device_file_info*) * COMEDI_NUM_MINORS); memset(comedi_file_info_table, 0,
sizeof(struct comedi_device_file_info *) * COMEDI_NUM_MINORS);
retval = register_chrdev_region(MKDEV(COMEDI_MAJOR, 0), retval = register_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS, "comedi"); COMEDI_NUM_MINORS, "comedi");
if (retval) if (retval)
return -EIO; return -EIO;
cdev_init(&comedi_cdev, &comedi_fops); cdev_init(&comedi_cdev, &comedi_fops);
...@@ -1916,7 +1917,7 @@ static int __init comedi_init(void) ...@@ -1916,7 +1917,7 @@ static int __init comedi_init(void)
kobject_set_name(&comedi_cdev.kobj, "comedi"); kobject_set_name(&comedi_cdev.kobj, "comedi");
if (cdev_add(&comedi_cdev, MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS)) { if (cdev_add(&comedi_cdev, MKDEV(COMEDI_MAJOR, 0), COMEDI_NUM_MINORS)) {
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0), unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS); COMEDI_NUM_MINORS);
return -EIO; return -EIO;
} }
comedi_class = class_create(THIS_MODULE, "comedi"); comedi_class = class_create(THIS_MODULE, "comedi");
...@@ -1924,23 +1925,22 @@ static int __init comedi_init(void) ...@@ -1924,23 +1925,22 @@ static int __init comedi_init(void)
printk("comedi: failed to create class"); printk("comedi: failed to create class");
cdev_del(&comedi_cdev); cdev_del(&comedi_cdev);
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0), unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS); COMEDI_NUM_MINORS);
return PTR_ERR(comedi_class); return PTR_ERR(comedi_class);
} }
/* XXX requires /proc interface */ /* XXX requires /proc interface */
comedi_proc_init(); comedi_proc_init();
// create devices files for legacy/manual use /* create devices files for legacy/manual use */
for (i = 0; i < COMEDI_NUM_LEGACY_MINORS; i++) { for (i = 0; i < COMEDI_NUM_LEGACY_MINORS; i++) {
int minor; int minor;
minor = comedi_alloc_board_minor(NULL); minor = comedi_alloc_board_minor(NULL);
if(minor < 0) if (minor < 0) {
{
comedi_cleanup_legacy_minors(); comedi_cleanup_legacy_minors();
cdev_del(&comedi_cdev); cdev_del(&comedi_cdev);
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0), unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS); COMEDI_NUM_MINORS);
return minor; return minor;
} }
} }
...@@ -1957,10 +1957,9 @@ static void __exit comedi_cleanup(void) ...@@ -1957,10 +1957,9 @@ static void __exit comedi_cleanup(void)
int i; int i;
comedi_cleanup_legacy_minors(); comedi_cleanup_legacy_minors();
for(i = 0; i < COMEDI_NUM_MINORS; ++i) for (i = 0; i < COMEDI_NUM_MINORS; ++i)
{
BUG_ON(comedi_file_info_table[i]); BUG_ON(comedi_file_info_table[i]);
}
class_destroy(comedi_class); class_destroy(comedi_class);
cdev_del(&comedi_cdev); cdev_del(&comedi_cdev);
...@@ -1976,26 +1975,25 @@ static void __exit comedi_cleanup(void) ...@@ -1976,26 +1975,25 @@ static void __exit comedi_cleanup(void)
module_init(comedi_init); module_init(comedi_init);
module_exit(comedi_cleanup); module_exit(comedi_cleanup);
void comedi_error(const comedi_device * dev, const char *s) void comedi_error(const comedi_device *dev, const char *s)
{ {
rt_printk("comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name, rt_printk("comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name,
s); s);
} }
void comedi_event(comedi_device * dev, comedi_subdevice * s) void comedi_event(comedi_device *dev, comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
unsigned runflags = 0; unsigned runflags = 0;
unsigned runflags_mask = 0; unsigned runflags_mask = 0;
//DPRINTK("comedi_event 0x%x\n",mask); /* DPRINTK("comedi_event 0x%x\n",mask); */
if ((comedi_get_subdevice_runflags(s) & SRF_RUNNING) == 0) if ((comedi_get_subdevice_runflags(s) & SRF_RUNNING) == 0)
return; return;
if (s->async-> if (s->async->
events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) {
{
runflags_mask |= SRF_RUNNING; runflags_mask |= SRF_RUNNING;
} }
/* remember if an error event has occured, so an error /* remember if an error event has occured, so an error
...@@ -2014,20 +2012,21 @@ void comedi_event(comedi_device * dev, comedi_subdevice * s) ...@@ -2014,20 +2012,21 @@ void comedi_event(comedi_device * dev, comedi_subdevice * s)
if (dev->rt) { if (dev->rt) {
#ifdef CONFIG_COMEDI_RT #ifdef CONFIG_COMEDI_RT
// pend wake up /* pend wake up */
comedi_rt_pend_wakeup(&async->wait_head); comedi_rt_pend_wakeup(&async->wait_head);
#else #else
printk("BUG: comedi_event() code unreachable\n"); printk
("BUG: comedi_event() code unreachable\n");
#endif #endif
} else { } else {
wake_up_interruptible(&async->wait_head); wake_up_interruptible(&async->wait_head);
if (s->subdev_flags & SDF_CMD_READ) { if (s->subdev_flags & SDF_CMD_READ) {
kill_fasync(&dev->async_queue, SIGIO, kill_fasync(&dev->async_queue, SIGIO,
POLL_IN); POLL_IN);
} }
if (s->subdev_flags & SDF_CMD_WRITE) { if (s->subdev_flags & SDF_CMD_WRITE) {
kill_fasync(&dev->async_queue, SIGIO, kill_fasync(&dev->async_queue, SIGIO,
POLL_OUT); POLL_OUT);
} }
} }
} else { } else {
...@@ -2043,8 +2042,8 @@ void comedi_event(comedi_device * dev, comedi_subdevice * s) ...@@ -2043,8 +2042,8 @@ void comedi_event(comedi_device * dev, comedi_subdevice * s)
s->async->events = 0; s->async->events = 0;
} }
void comedi_set_subdevice_runflags(comedi_subdevice * s, unsigned mask, void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
unsigned bits) unsigned bits)
{ {
unsigned long flags; unsigned long flags;
...@@ -2054,7 +2053,7 @@ void comedi_set_subdevice_runflags(comedi_subdevice * s, unsigned mask, ...@@ -2054,7 +2053,7 @@ void comedi_set_subdevice_runflags(comedi_subdevice * s, unsigned mask,
comedi_spin_unlock_irqrestore(&s->spin_lock, flags); comedi_spin_unlock_irqrestore(&s->spin_lock, flags);
} }
unsigned comedi_get_subdevice_runflags(comedi_subdevice * s) unsigned comedi_get_subdevice_runflags(comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
unsigned runflags; unsigned runflags;
...@@ -2065,7 +2064,7 @@ unsigned comedi_get_subdevice_runflags(comedi_subdevice * s) ...@@ -2065,7 +2064,7 @@ unsigned comedi_get_subdevice_runflags(comedi_subdevice * s)
return runflags; return runflags;
} }
static int is_device_busy(comedi_device * dev) static int is_device_busy(comedi_device *dev)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int i; int i;
...@@ -2094,7 +2093,8 @@ void comedi_device_init(comedi_device *dev) ...@@ -2094,7 +2093,8 @@ void comedi_device_init(comedi_device *dev)
void comedi_device_cleanup(comedi_device *dev) void comedi_device_cleanup(comedi_device *dev)
{ {
if(dev == NULL) return; if (dev == NULL)
return;
mutex_lock(&dev->mutex); mutex_lock(&dev->mutex);
comedi_device_detach(dev); comedi_device_detach(dev);
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
...@@ -2109,38 +2109,37 @@ int comedi_alloc_board_minor(struct device *hardware_device) ...@@ -2109,38 +2109,37 @@ int comedi_alloc_board_minor(struct device *hardware_device)
unsigned i; unsigned i;
info = kzalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL); info = kzalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL);
if(info == NULL) return -ENOMEM; if (info == NULL)
return -ENOMEM;
info->device = kzalloc(sizeof(comedi_device), GFP_KERNEL); info->device = kzalloc(sizeof(comedi_device), GFP_KERNEL);
if(info->device == NULL) if (info->device == NULL) {
{
kfree(info); kfree(info);
return -ENOMEM; return -ENOMEM;
} }
comedi_device_init(info->device); comedi_device_init(info->device);
comedi_spin_lock_irqsave(&comedi_file_info_table_lock, flags); comedi_spin_lock_irqsave(&comedi_file_info_table_lock, flags);
for(i = 0; i < COMEDI_NUM_BOARD_MINORS; ++i) for (i = 0; i < COMEDI_NUM_BOARD_MINORS; ++i) {
{ if (comedi_file_info_table[i] == NULL) {
if(comedi_file_info_table[i] == NULL)
{
comedi_file_info_table[i] = info; comedi_file_info_table[i] = info;
break; break;
} }
} }
comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
if(i == COMEDI_NUM_BOARD_MINORS) if (i == COMEDI_NUM_BOARD_MINORS) {
{
comedi_device_cleanup(info->device); comedi_device_cleanup(info->device);
kfree(info->device); kfree(info->device);
kfree(info); kfree(info);
rt_printk("comedi: error: ran out of minor numbers for board device files.\n"); rt_printk
("comedi: error: ran out of minor numbers for board device files.\n");
return -EBUSY; return -EBUSY;
} }
info->device->minor = i; info->device->minor = i;
csdev = COMEDI_DEVICE_CREATE(comedi_class, NULL, csdev = COMEDI_DEVICE_CREATE(comedi_class, NULL,
MKDEV(COMEDI_MAJOR, i), NULL, hardware_device, "comedi%i", i); MKDEV(COMEDI_MAJOR, i), NULL,
if(!IS_ERR(csdev)) { hardware_device, "comedi%i", i);
if (!IS_ERR(csdev))
info->device->class_dev = csdev; info->device->class_dev = csdev;
}
return i; return i;
} }
...@@ -2155,14 +2154,12 @@ void comedi_free_board_minor(unsigned minor) ...@@ -2155,14 +2154,12 @@ void comedi_free_board_minor(unsigned minor)
comedi_file_info_table[minor] = NULL; comedi_file_info_table[minor] = NULL;
comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
if(info) if (info) {
{
comedi_device *dev = info->device; comedi_device *dev = info->device;
if(dev) if (dev) {
{ if (dev->class_dev) {
if(dev->class_dev) device_destroy(comedi_class,
{ MKDEV(COMEDI_MAJOR, dev->minor));
device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, dev->minor));
} }
comedi_device_cleanup(dev); comedi_device_cleanup(dev);
kfree(dev); kfree(dev);
...@@ -2179,33 +2176,33 @@ int comedi_alloc_subdevice_minor(comedi_device *dev, comedi_subdevice *s) ...@@ -2179,33 +2176,33 @@ int comedi_alloc_subdevice_minor(comedi_device *dev, comedi_subdevice *s)
unsigned i; unsigned i;
info = kmalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL); info = kmalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL);
if(info == NULL) return -ENOMEM; if (info == NULL)
return -ENOMEM;
info->device = dev; info->device = dev;
info->read_subdevice = s; info->read_subdevice = s;
info->write_subdevice = s; info->write_subdevice = s;
comedi_spin_lock_irqsave(&comedi_file_info_table_lock, flags); comedi_spin_lock_irqsave(&comedi_file_info_table_lock, flags);
for(i = COMEDI_FIRST_SUBDEVICE_MINOR; i < COMEDI_NUM_BOARD_MINORS; ++i) for (i = COMEDI_FIRST_SUBDEVICE_MINOR; i < COMEDI_NUM_BOARD_MINORS; ++i) {
{ if (comedi_file_info_table[i] == NULL) {
if(comedi_file_info_table[i] == NULL)
{
comedi_file_info_table[i] = info; comedi_file_info_table[i] = info;
break; break;
} }
} }
comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
if(i == COMEDI_NUM_MINORS) if (i == COMEDI_NUM_MINORS) {
{
kfree(info); kfree(info);
rt_printk("comedi: error: ran out of minor numbers for board device files.\n"); rt_printk
("comedi: error: ran out of minor numbers for board device files.\n");
return -EBUSY; return -EBUSY;
} }
s->minor = i; s->minor = i;
csdev = COMEDI_DEVICE_CREATE(comedi_class, dev->class_dev, csdev = COMEDI_DEVICE_CREATE(comedi_class, dev->class_dev,
MKDEV(COMEDI_MAJOR, i), NULL, NULL, "comedi%i_subd%i", dev->minor, (int)(s - dev->subdevices)); MKDEV(COMEDI_MAJOR, i), NULL, NULL,
if(!IS_ERR(csdev)) "comedi%i_subd%i", dev->minor,
{ (int)(s - dev->subdevices));
if (!IS_ERR(csdev))
s->class_dev = csdev; s->class_dev = csdev;
}
return i; return i;
} }
...@@ -2214,8 +2211,10 @@ void comedi_free_subdevice_minor(comedi_subdevice *s) ...@@ -2214,8 +2211,10 @@ void comedi_free_subdevice_minor(comedi_subdevice *s)
unsigned long flags; unsigned long flags;
struct comedi_device_file_info *info; struct comedi_device_file_info *info;
if(s == NULL) return; if (s == NULL)
if(s->minor < 0) return; return;
if (s->minor < 0)
return;
BUG_ON(s->minor >= COMEDI_NUM_MINORS); BUG_ON(s->minor >= COMEDI_NUM_MINORS);
BUG_ON(s->minor < COMEDI_FIRST_SUBDEVICE_MINOR); BUG_ON(s->minor < COMEDI_FIRST_SUBDEVICE_MINOR);
...@@ -2225,8 +2224,7 @@ void comedi_free_subdevice_minor(comedi_subdevice *s) ...@@ -2225,8 +2224,7 @@ void comedi_free_subdevice_minor(comedi_subdevice *s)
comedi_file_info_table[s->minor] = NULL; comedi_file_info_table[s->minor] = NULL;
comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
if(s->class_dev) if (s->class_dev) {
{
device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor)); device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor));
s->class_dev = NULL; s->class_dev = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7