Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00b86396 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e1087b5

drivers/staging/comedi/drivers/pcmuio.c

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