aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-01-30 17:25:31 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-31 04:40:41 -0500
commit085494ac2039433a5df9fdd6fb653579e18b8c71 (patch)
treec5cce76677c21039454ed0d8fd48cbb9cf7fd692
parent39bd5e59b1ebdaa58d9458923ab96f61bda1296c (diff)
staging: comedi: don't expose comedi_proc_{init,cleanup}
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. 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.h15
-rw-r--r--drivers/staging/comedi/comedidev.h13
2 files changed, 15 insertions, 13 deletions
diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h
index 81b6f7811625..b36bb954db58 100644
--- a/drivers/staging/comedi/comedi_internal.h
+++ b/drivers/staging/comedi/comedi_internal.h
@@ -31,4 +31,19 @@ int insn_inval(struct comedi_device *, struct comedi_subdevice *,
31void comedi_device_detach(struct comedi_device *); 31void comedi_device_detach(struct comedi_device *);
32int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *); 32int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *);
33 33
34#ifdef CONFIG_PROC_FS
35
36/* proc.c */
37
38void comedi_proc_init(void);
39void comedi_proc_cleanup(void);
40#else
41static inline void comedi_proc_init(void)
42{
43}
44static inline void comedi_proc_cleanup(void)
45{
46}
47#endif
48
34#endif /* _COMEDI_INTERNAL_H */ 49#endif /* _COMEDI_INTERNAL_H */
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index afaf2ae4a9ec..f4541aec419e 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -263,19 +263,6 @@ void cleanup_polling(void);
263void start_polling(struct comedi_device *); 263void start_polling(struct comedi_device *);
264void stop_polling(struct comedi_device *); 264void stop_polling(struct comedi_device *);
265 265
266#ifdef CONFIG_PROC_FS
267void comedi_proc_init(void);
268void comedi_proc_cleanup(void);
269#else
270static inline void comedi_proc_init(void)
271{
272}
273
274static inline void comedi_proc_cleanup(void)
275{
276}
277#endif
278
279/* subdevice runflags */ 266/* subdevice runflags */
280enum subdevice_runflags { 267enum subdevice_runflags {
281 SRF_USER = 0x00000001, 268 SRF_USER = 0x00000001,