diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-30 15:25:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-31 10:40:41 +0100 |
| commit | 39bd5e59b1ebdaa58d9458923ab96f61bda1296c (patch) | |
| tree | 02a02d7d74a9b2deda6ff0ca6c68bfd03f2bc27f | |
| parent | 1ae6b20b88737f1828649b6cbe349c83b9f97bf0 (diff) | |
staging: comedi: don't expose comedi_device_{attach,detach}
These functions are only used by the comedi core. Move the
prototypes to comedi_internal.h so they are not exposed to
the comedi drivers.
Tidy up comedi_internal.h a bit so that all the internal stuff
in drivers.c is grouped.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/comedi_internal.h | 11 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h index 5e6f05b30e6c..81b6f7811625 100644 --- a/drivers/staging/comedi/comedi_internal.h +++ b/drivers/staging/comedi/comedi_internal.h @@ -8,8 +8,6 @@ */ int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo __user *arg); -int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data); int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); int comedi_find_board_minor(struct device *hardware_device); @@ -22,6 +20,15 @@ unsigned int comedi_buf_write_n_allocated(struct comedi_async *async); extern unsigned int comedi_default_buf_size_kb; extern unsigned int comedi_default_buf_maxsize_kb; extern bool comedi_autoconfig; + +/* drivers.c */ + extern struct comedi_driver *comedi_drivers; +int insn_inval(struct comedi_device *, struct comedi_subdevice *, + struct comedi_insn *, unsigned int *); + +void comedi_device_detach(struct comedi_device *); +int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *); + #endif /* _COMEDI_INTERNAL_H */ diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 0f29dd5287bb..afaf2ae4a9ec 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -369,9 +369,6 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s); int comedi_alloc_subdevices(struct comedi_device *, int); -void comedi_device_detach(struct comedi_device *); -int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *); - int comedi_auto_config(struct device *, struct comedi_driver *, unsigned long context); void comedi_auto_unconfig(struct device *); |