From: H Hartley Sweeten Date: Tue, 4 Jun 2013 01:02:34 +0000 (-0700) Subject: staging: comedi: pcmuio: remove 'CALC_N_SUBDEVS' macro X-Git-Tag: firefly_0821_release~176^2~5845^2~290 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00b863964d3d24e7ae1dfb571e45707136c6cf42;p=firefly-linux-kernel-4.4.55.git staging: comedi: pcmuio: remove 'CALC_N_SUBDEVS' macro This macro is only used once in the driver, just remove it. This also fixes a > 80 char line checkpatch.pl warning. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 9d8b78015cbb..8ce7e538d77e 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -90,7 +90,6 @@ #define INTR_PORTS_PER_SUBDEV (INTR_CHANS_PER_ASIC/CHANS_PER_PORT) #define MAX_DIO_CHANS (PORTS_PER_ASIC*2*CHANS_PER_PORT) #define MAX_ASICS (MAX_DIO_CHANS/CHANS_PER_ASIC) -#define CALC_N_SUBDEVS(nchans) ((nchans)/MAX_CHANS_PER_SUBDEV + (!!((nchans)%MAX_CHANS_PER_SUBDEV)) /*+ (nchans > INTR_CHANS_PER_ASIC ? 2 : 1)*/) /* IO Memory sizes */ #define ASIC_IOSIZE (0x10) #define PCMUIO48_IOSIZE ASIC_IOSIZE @@ -809,7 +808,8 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it) } chans_left = CHANS_PER_ASIC * board->num_asics; - n_subdevs = CALC_N_SUBDEVS(chans_left); + n_subdevs = (chans_left / MAX_CHANS_PER_SUBDEV) + + (!!(chans_left % MAX_CHANS_PER_SUBDEV)); devpriv->sprivs = kcalloc(n_subdevs, sizeof(struct pcmuio_subdev_private), GFP_KERNEL);