diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2013-04-04 14:59:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 14:33:19 -0700 |
| commit | ea1cc3973a6f3832956d99f74b20970a4e71bd37 (patch) | |
| tree | 2a347cbc8585759cf16d2c704ba58989e434f6d9 /drivers/staging/comedi/comedi_fops.c | |
| parent | 5b7dba1bdda5b5864b61d28e32f860510e9a660f (diff) | |
staging: comedi: remove comedi_clear_minor()
`comedi_clear_minor()` calls either `comedi_clear_board_minor()` or
`comedi_clear_subdevice_minor()` depending on its minor device number
parameter. The one it calls only depends on where it is called from, so
bypass the calls to `comedi_clear_minor()` and remove it.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index c57f853d3c4..00481357a7b 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -150,14 +150,6 @@ static struct comedi_file_info *comedi_clear_subdevice_minor(unsigned minor) return info; } -static struct comedi_file_info *comedi_clear_minor(unsigned minor) -{ - if (minor < COMEDI_NUM_BOARD_MINORS) - return comedi_clear_board_minor(minor); - else - return comedi_clear_subdevice_minor(minor); -} - static void comedi_free_board_file_info(struct comedi_file_info *info) { if (info) { @@ -1745,7 +1737,7 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, dev->minor >= comedi_num_legacy_minors) { /* Successfully unconfigured a dynamically * allocated device. Try and remove it. */ - info = comedi_clear_minor(dev->minor); + info = comedi_clear_board_minor(dev->minor); if (info) { mutex_unlock(&dev->mutex); comedi_free_board_file_info(info); @@ -2411,7 +2403,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device) static void comedi_free_board_minor(unsigned minor) { BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); - comedi_free_board_file_info(comedi_clear_minor(minor)); + comedi_free_board_file_info(comedi_clear_board_minor(minor)); } void comedi_release_hardware_device(struct device *hardware_device) @@ -2485,7 +2477,7 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) BUG_ON(s->minor >= COMEDI_NUM_MINORS); BUG_ON(s->minor < COMEDI_NUM_BOARD_MINORS); - info = comedi_clear_minor(s->minor); + info = comedi_clear_subdevice_minor(s->minor); if (s->class_dev) { device_destroy(comedi_class, MKDEV(COMEDI_MAJOR, s->minor)); s->class_dev = NULL; |