diff options
| author |   Bill Pemberton <wfp5p@virginia.edu> | 2009-05-14 15:24:28 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:34 -0700 |
| commit | 214e7b5c8281bf41238f575128e4fec5652ed797 (patch) | |
| tree | 831077caecd76336a18aa3a51b4d232b5d82ecb5 /drivers/staging/comedi | |
| parent | staging: comedi: fix missing parentheses (diff) | |
| download | linux-dev-214e7b5c8281bf41238f575128e4fec5652ed797.tar.xz linux-dev-214e7b5c8281bf41238f575128e4fec5652ed797.zip | |
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')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmda12.c | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmmio.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmuio.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index f1a8cdfaaa48..6e172a6b1cb2 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c @@ -55,7 +55,6 @@ Configuration Options: #include <linux/pci.h> /* for PCI devices */ -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define SDEV_NO ((int)(s - dev->subdevices)) #define CHANS 8 #define IOSIZE 16 diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 6931f1075089..e1ad03e234b7 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -77,8 +77,6 @@ Configuration Options: #include "../comedidev.h" #include <linux/pci.h> /* for PCI devices */ -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - /* This stuff is all from pcmuio.c -- it refers to the DIO subdevices only */ #define CHANS_PER_PORT 8 #define PORTS_PER_ASIC 6 @@ -436,7 +434,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->type = COMEDI_SUBD_DIO; s->insn_bits = pcmmio_dio_insn_bits; s->insn_config = pcmmio_dio_insn_config; - s->n_chan = MIN(chans_left, MAX_CHANS_PER_SUBDEV); + s->n_chan = min(chans_left, MAX_CHANS_PER_SUBDEV); subpriv->dio.intr.asic = -1; subpriv->dio.intr.first_chan = -1; subpriv->dio.intr.asic_chan = -1; diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 8df67c37795b..ce0aa6b87fb0 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; |