aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/pcmuio.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-05-14 15:24:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:34 -0700
commit214e7b5c8281bf41238f575128e4fec5652ed797 (patch)
tree831077caecd76336a18aa3a51b4d232b5d82ecb5 /drivers/staging/comedi/drivers/pcmuio.c
parentf764df88f86c8db669bd7bfac230b9d2689ae322 (diff)
staging: comedi: Remove MIN macro
Remove the MIN() macro and instead use the min() provided by kernel.h Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/pcmuio.c')
-rw-r--r--drivers/staging/comedi/drivers/pcmuio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 8df67c37795..ce0aa6b87fb 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -80,7 +80,6 @@ Configuration Options:
#include <linux/pci.h> /* for PCI devices */
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define CHANS_PER_PORT 8
#define PORTS_PER_ASIC 6
#define INTR_PORTS_PER_ASIC 3
@@ -360,7 +359,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_DIO;
s->insn_bits = pcmuio_dio_insn_bits;
s->insn_config = pcmuio_dio_insn_config;
- s->n_chan = MIN(chans_left, MAX_CHANS_PER_SUBDEV);
+ s->n_chan = min(chans_left, MAX_CHANS_PER_SUBDEV);
subpriv->intr.asic = -1;
subpriv->intr.first_chan = -1;
subpriv->intr.asic_chan = -1;