From f4de76ae7999ebe4b68dbed736215ccbf62cd317 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 17 Sep 2012 13:13:32 -0700 Subject: [PATCH] --- yaml --- r: 325385 b: refs/heads/master c: 29aba763060a2c44a7449dff1579f0fed52ea567 h: refs/heads/master i: 325383: 46b4419b12506e91a5f998b60f877e789c1cdd4f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_common.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 71030c605cff..388216a77bdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e76c95107a3423e3dc9d6df09ad802f0e237e9b +refs/heads/master: 29aba763060a2c44a7449dff1579f0fed52ea567 diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c index 8fd967aec3b3..87995da00f61 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c @@ -644,10 +644,10 @@ static void ni_release_ao_mite_channel(struct comedi_device *dev) #endif /* PCIDMA */ } -void ni_release_gpct_mite_channel(struct comedi_device *dev, - unsigned gpct_index) -{ #ifdef PCIDMA +static void ni_release_gpct_mite_channel(struct comedi_device *dev, + unsigned gpct_index) +{ unsigned long flags; BUG_ON(gpct_index >= NUM_GPCT); @@ -663,8 +663,8 @@ void ni_release_gpct_mite_channel(struct comedi_device *dev, mite_release_channel(mite_chan); } spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); -#endif /* PCIDMA */ } +#endif /* PCIDMA */ static void ni_release_cdo_mite_channel(struct comedi_device *dev) { @@ -1881,7 +1881,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, return insn->n; } -void ni_prime_channelgain_list(struct comedi_device *dev) +static void ni_prime_channelgain_list(struct comedi_device *dev) { int i; devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register);