From 181bd67bf5780b941f2cba6247ed1c0cdfce468a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 15:15:06 -0700 Subject: [PATCH] Staging: comedi: make comedi_set_subdevice_runflags() static No one calls this anymore, except the core comedi code, so mark it static and don't export it. Cc: Ian Abbott Cc: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_fops.c | 23 +++++++++++------------ drivers/staging/comedi/comedidev.h | 2 -- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index b11f9b08000b..135c80ab6d10 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -954,6 +954,17 @@ error: return ret; } +static void comedi_set_subdevice_runflags(struct comedi_subdevice *s, + unsigned mask, unsigned bits) +{ + unsigned long flags; + + spin_lock_irqsave(&s->spin_lock, flags); + s->runflags &= ~mask; + s->runflags |= (bits & mask); + spin_unlock_irqrestore(&s->spin_lock, flags); +} + /* COMEDI_CMD command ioctl @@ -2021,18 +2032,6 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) } EXPORT_SYMBOL(comedi_event); -void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, - unsigned bits) -{ - unsigned long flags; - - spin_lock_irqsave(&s->spin_lock, flags); - s->runflags &= ~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) { unsigned long flags; diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 5e4672751d42..9e13964ac6d3 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -383,8 +383,6 @@ enum subdevice_runflags { int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg); int comedi_check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist); -void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, - unsigned bits); unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s); int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); -- 2.39.5