Commit 27bf0bc9 authored by Mark's avatar Mark Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Cleanup on dmm32at.c from checkpatch.pl 



This patch cleans up some style issues in dmm32at.c as found by checkpatch.pl

Signed-off-by: default avatarMark Rankilor <reodge@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97feeef5

drivers/staging/comedi/drivers/dmm32at.c

+25 −20
Original line number Diff line number Diff line
@@ -299,12 +299,14 @@ static int dmm32at_attach(struct comedi_device *dev, 
	iobase = it->options[0];

	irq = it->options[1];



	printk("comedi%d: dmm32at: attaching\n", dev->minor);

	printk("dmm32at: probing at address 0x%04lx, irq %u\n", iobase, irq);

	printk(KERN_INFO "comedi%d: dmm32at: attaching\n", dev->minor);

	printk(KERN_DEBUG "dmm32at: probing at address 0x%04lx, irq %u\n",

	       iobase, irq);



	/* register address space */

	if (!request_region(iobase, DMM32AT_MEMSIZE, thisboard->name)) {

		printk("I/O port conflict\n");

		printk(KERN_ERR "comedi%d: dmm32at: I/O port conflict\n",

		       dev->minor);

		return -EIO;

	}

	dev->iobase = iobase;
@@ -342,14 +344,15 @@ static int dmm32at_attach(struct comedi_device *dev, 
	intstat = dmm_inb(dev, DMM32AT_INTCLOCK);

	airback = dmm_inb(dev, DMM32AT_AIRBACK);



	printk("dmm32at: lo=0x%02x hi=0x%02x fifostat=0x%02x\n",

	printk(KERN_DEBUG "dmm32at: lo=0x%02x hi=0x%02x fifostat=0x%02x\n",

	       ailo, aihi, fifostat);

	printk("dmm32at: aistat=0x%02x intstat=0x%02x airback=0x%02x\n",

	printk(KERN_DEBUG

	       "dmm32at: aistat=0x%02x intstat=0x%02x airback=0x%02x\n",

	       aistat, intstat, airback);



	if ((ailo != 0x00) || (aihi != 0x1f) || (fifostat != 0x80) ||

	    (aistat != 0x60 || (intstat != 0x00) || airback != 0x0c)) {

		printk("dmmat32: board detection failed\n");

		printk(KERN_ERR "dmmat32: board detection failed\n");

		return -EIO;

	}
@@ -357,7 +360,7 @@ static int dmm32at_attach(struct comedi_device *dev, 
	if (irq) {

		ret = request_irq(irq, dmm32at_isr, 0, thisboard->name, dev);

		if (ret < 0) {

			printk("irq conflict\n");

			printk(KERN_ERR "dmm32at: irq conflict\n");

			return ret;

		}

		dev->irq = irq;
@@ -441,7 +444,7 @@ static int dmm32at_attach(struct comedi_device *dev, 
	}



	/* success */

	printk("comedi%d: dmm32at: attached\n", dev->minor);

	printk(KERN_INFO "comedi%d: dmm32at: attached\n", dev->minor);



	return 1;
@@ -457,7 +460,7 @@ static int dmm32at_attach(struct comedi_device *dev, 
 */

static int dmm32at_detach(struct comedi_device *dev)

{

	printk("comedi%d: dmm32at: remove\n", dev->minor);

	printk(KERN_INFO "comedi%d: dmm32at: remove\n", dev->minor);

	if (dev->irq)

		free_irq(dev->irq, dev);

	if (dev->iobase)
@@ -505,7 +508,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev, 
			break;

	}

	if (i == 40000) {

		printk("timeout\n");

		printk(KERN_WARNING "dmm32at: timeout\n");

		return -ETIMEDOUT;

	}
@@ -520,7 +523,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev, 
				break;

		}

		if (i == 40000) {

			printk("timeout\n");

			printk(KERN_WARNING "dmm32at: timeout\n");

			return -ETIMEDOUT;

		}
@@ -590,7 +593,8 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev, 
	if (err)

		return 1;



	/* step 2: make sure trigger sources are unique and mutually compatible */

	/* step 2: make sure trigger sources are unique and mutually

	 * compatible */



	/* note that mutual compatibility is not an issue here */

	if (cmd->scan_begin_src != TRIG_TIMER &&
@@ -763,7 +767,8 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	if (cmd->stop_src == TRIG_COUNT)

		devpriv->ai_scans_left = cmd->stop_arg;

	else {			/* TRIG_NONE */

		devpriv->ai_scans_left = 0xffffffff;	/* indicates TRIG_NONE to isr */

		devpriv->ai_scans_left = 0xffffffff; /* indicates TRIG_NONE to

						      * isr */

	}



	/* wait for circuit to settle */
@@ -773,7 +778,7 @@ static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
			break;

	}

	if (i == 40000) {

		printk("timeout\n");

		printk(KERN_WARNING "dmm32at: timeout\n");

		return -ETIMEDOUT;

	}
@@ -900,7 +905,7 @@ static int dmm32at_ao_winsn(struct comedi_device *dev, 
				break;

		}

		if (i == 40000) {

			printk("timeout\n");

			printk(KERN_WARNING "dmm32at: timeout\n");

			return -ETIMEDOUT;

		}

		/* dummy read to update trigger the output */