From: H Hartley Sweeten Date: Tue, 4 Jun 2013 02:03:29 +0000 (-0700) Subject: staging: comedi: pcmda12: remove 'BITS' define X-Git-Tag: v3.11-rc1~158^2~283 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83bb524d5f8fb9487e9e294835651f518f791748;p=platform%2Fupstream%2Fkernel-adaptation-pc.git staging: comedi: pcmda12: remove 'BITS' define 'BITS' is a pretty generic name for a define. It's only used in the board attach to set the subdevice 'maxdata' so instead of renaming the define just open code the value and remove the define. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index 9b3f061..2aba7bf 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c @@ -55,7 +55,6 @@ Configuration Options: #define MSB(x) ((unsigned char)((((unsigned short)(x))>>8) & 0xff)) #define LSB_PORT(chan) (dev->iobase + (chan)*2) #define MSB_PORT(chan) (LSB_PORT(chan)+1) -#define BITS 12 /* note these have no effect and are merely here for reference.. these are configured by jumpering the board! */ @@ -169,7 +168,7 @@ static int pcmda12_attach(struct comedi_device *dev, s = &dev->subdevices[0]; s->private = NULL; - s->maxdata = (0x1 << BITS) - 1; + s->maxdata = 0x0fff; s->range_table = &pcmda12_ranges; s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;