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

Commit 3555a4c3 authored by Xenofon Foukas's avatar Xenofon Foukas Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Fix coding style issues in ii_pci20kc.c 



This patch fixes the following issues in file ii_pci20kc.c:

WARNING: please, no space before tabs
WARNING: unnecessary whitespace before a quoted newline
WARNING: line over 80 characters

Signed-off-by: default avatarXenofon Foukas <foukas.xenofon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 91cda632

drivers/staging/comedi/drivers/ii_pci20kc.c

+46 −20
Original line number Diff line number Diff line
@@ -376,9 +376,20 @@ static int pci20341_insn_read(struct comedi_device *dev, 
static const int pci20341_timebase[] = { 0x00, 0x00, 0x00, 0x04 };

static const int pci20341_settling_time[] = { 0x58, 0x58, 0x93, 0x99 };



static const struct comedi_lrange range_bipolar0_5 = { 1, {BIP_RANGE(0.5)} };

static const struct comedi_lrange range_bipolar0_05 = { 1, {BIP_RANGE(0.05)} };

static const struct comedi_lrange range_bipolar0_025 = { 1, {BIP_RANGE(0.025)} };

static const struct comedi_lrange range_bipolar0_5 = {

	1,

	{BIP_RANGE(0.5)}

};



static const struct comedi_lrange range_bipolar0_05 = {

	1,

	{BIP_RANGE(0.05)}

};



static const struct comedi_lrange range_bipolar0_025 = {

	1,

	{BIP_RANGE(0.025)}

};



static const struct comedi_lrange *const pci20341_ranges[] = {

	&range_bipolar5,
@@ -408,12 +419,18 @@ static int pci20341_init(struct comedi_device *dev, struct comedi_subdevice *s, 
	s->maxdata = 0xffff;

	s->range_table = pci20341_ranges[opt0];



	option = sdp->pci20341.timebase | PCI20341_REPMODE;	/* depends on gain, trigger, repetition mode */



	writeb(PCI20341_INIT, sdp->iobase + PCI20341_CONFIG_REG);	/* initialize Module */

	writeb(PCI20341_PACER, sdp->iobase + PCI20341_MOD_STATUS);	/* set Pacer */

	writeb(option, sdp->iobase + PCI20341_OPT_REG);	/* option register */

	writeb(sdp->pci20341.settling_time, sdp->iobase + PCI20341_SET_TIME_REG);	/* settling time counter */

	/* depends on gain, trigger, repetition mode */

	option = sdp->pci20341.timebase | PCI20341_REPMODE;



	/* initialize Module */

	writeb(PCI20341_INIT, sdp->iobase + PCI20341_CONFIG_REG);

	/* set Pacer */

	writeb(PCI20341_PACER, sdp->iobase + PCI20341_MOD_STATUS);

	/* option register */

	writeb(option, sdp->iobase + PCI20341_OPT_REG);

	/* settling time counter */

	writeb(sdp->pci20341.settling_time,

		sdp->iobase + PCI20341_SET_TIME_REG);

	/* trigger not implemented */

	return 0;

}
@@ -429,11 +446,15 @@ static int pci20341_insn_read(struct comedi_device *dev, 
	unsigned int clb;	/* channel list byte */

	unsigned int boarddata;



	writeb(1, sdp->iobase + PCI20341_LCHAN_ADDR_REG);	/* write number of input channels */

	/* write number of input channels */

	writeb(1, sdp->iobase + PCI20341_LCHAN_ADDR_REG);

	clb = PCI20341_DAISY_CHAIN | PCI20341_MUX | (sdp->pci20341.ai_gain << 3)

	    | CR_CHAN(insn->chanspec);

	writeb(clb, sdp->iobase + PCI20341_CHAN_LIST);

	writeb(0x00, sdp->iobase + PCI20341_CC_RESET);	/* reset settling time counter and trigger delay counter */



	/* reset settling time counter and trigger delay counter */

	writeb(0x00, sdp->iobase + PCI20341_CC_RESET);



	writeb(0x00, sdp->iobase + PCI20341_CHAN_RESET);



	/* generate Pacer */
@@ -444,9 +465,12 @@ static int pci20341_insn_read(struct comedi_device *dev, 
		 * the whole interrupt stuff

		 */

		j = 0;

		readb(sdp->iobase + PCI20341_SOFT_PACER);	/* generate Pacer */

		/* generate Pacer */

		readb(sdp->iobase + PCI20341_SOFT_PACER);



		eoc = readb(sdp->iobase + PCI20341_STATUS_REG);

		while ((eoc < 0x80) && j < 100) {	/* poll Interrupt Flag */

		/* poll Interrupt Flag */

		while ((eoc < 0x80) && j < 100) {

			j++;

			eoc = readb(sdp->iobase + PCI20341_STATUS_REG);

		}
@@ -460,7 +484,9 @@ static int pci20341_insn_read(struct comedi_device *dev, 
		lo = readb(sdp->iobase + PCI20341_LDATA);

		hi = readb(sdp->iobase + PCI20341_LDATA + 1);

		boarddata = lo + 0x100 * hi;

		data[i] = (short)((boarddata + 0x8000) & 0xffff);	/* board-data -> comedi-data */



		/* board-data -> comedi-data */

		data[i] = (short)((boarddata + 0x8000) & 0xffff);

	}



	return i;