From: Greg Kroah-Hartman Date: Sat, 1 May 2010 19:02:23 +0000 (-0700) Subject: Staging: comedi: more EXPORT_SYMBOL movement X-Git-Tag: MMI-PSA29.97-13-9~23841^2^2~295 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=18736438ae4ab3d96602b92446e07cc03c024b02;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: comedi: more EXPORT_SYMBOL movement This moves the markings to the comedi_fops.c file, where they belong. Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 1b3aed4ee60a..4fe3d0c2e6bf 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -57,6 +57,7 @@ MODULE_LICENSE("GPL"); #ifdef CONFIG_COMEDI_DEBUG int comedi_debug; +EXPORT_SYMBOL(comedi_debug); module_param(comedi_debug, int, 0644); #endif @@ -1975,6 +1976,7 @@ void comedi_error(const struct comedi_device *dev, const char *s) printk(KERN_ERR "comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name, s); } +EXPORT_SYMBOL(comedi_error); void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) { @@ -2017,6 +2019,7 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) } s->async->events = 0; } +EXPORT_SYMBOL(comedi_event); void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, unsigned bits) @@ -2028,6 +2031,7 @@ void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, s->runflags |= (bits & mask); spin_unlock_irqrestore(&s->spin_lock, flags); } +EXPORT_SYMBOL(comedi_set_subdevice_runflags); unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) { @@ -2039,6 +2043,7 @@ unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) spin_unlock_irqrestore(&s->spin_lock, flags); return runflags; } +EXPORT_SYMBOL(comedi_get_subdevice_runflags); static int is_device_busy(struct comedi_device *dev) { @@ -2152,6 +2157,7 @@ int comedi_alloc_board_minor(struct device *hardware_device) } return i; } +EXPORT_SYMBOL_GPL(comedi_alloc_board_minor); void comedi_free_board_minor(unsigned minor) { @@ -2177,6 +2183,7 @@ void comedi_free_board_minor(unsigned minor) kfree(info); } } +EXPORT_SYMBOL_GPL(comedi_free_board_minor); int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s) @@ -2286,6 +2293,7 @@ struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor) spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); return info; } +EXPORT_SYMBOL_GPL(comedi_get_device_file_info); static int resize_async_buffer(struct comedi_device *dev, struct comedi_subdevice *s, diff --git a/drivers/staging/comedi/comedi_ksyms.c b/drivers/staging/comedi/comedi_ksyms.c index c0e53bc269c0..9dc04a62a039 100644 --- a/drivers/staging/comedi/comedi_ksyms.c +++ b/drivers/staging/comedi/comedi_ksyms.c @@ -26,21 +26,12 @@ #include "comedidev.h" /* for drivers */ -EXPORT_SYMBOL(comedi_error); -EXPORT_SYMBOL(comedi_event); -EXPORT_SYMBOL(comedi_get_subdevice_runflags); -EXPORT_SYMBOL(comedi_set_subdevice_runflags); EXPORT_SYMBOL(range_bipolar10); EXPORT_SYMBOL(range_bipolar5); EXPORT_SYMBOL(range_bipolar2_5); EXPORT_SYMBOL(range_unipolar10); EXPORT_SYMBOL(range_unipolar5); EXPORT_SYMBOL(range_unknown); -#ifdef CONFIG_COMEDI_DEBUG -EXPORT_SYMBOL(comedi_debug); -#endif -EXPORT_SYMBOL_GPL(comedi_alloc_board_minor); -EXPORT_SYMBOL_GPL(comedi_free_board_minor); EXPORT_SYMBOL_GPL(comedi_pci_auto_config); EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); EXPORT_SYMBOL_GPL(comedi_usb_auto_config); @@ -48,4 +39,3 @@ EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig); /* for kcomedilib */ EXPORT_SYMBOL(check_chanlist); -EXPORT_SYMBOL_GPL(comedi_get_device_file_info);