Commit 214e7b5c authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

staging: comedi: Remove MIN macro 



Remove the MIN() macro and instead use the min() provided by kernel.h

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f764df88

drivers/staging/comedi/drivers/pcmda12.c

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/comedi/drivers/pcmmio.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/pcmuio.c

+1 −2
Original line number Diff line number Diff line
@@ -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;