Commit 95a2572f authored by Dirk Hohndel's avatar Dirk Hohndel Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: gsc_hpdi: Fix style issues 



Style cleanup in staging based on Greg's tutorial / checkpatch
Fix 80 char line length (where useful) - includes two changes to code
to make it more logical / readable
Remove {} around single line blocks

Signed-off-by: default avatarDirk Hohndel <hohndel@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 92e462c3

drivers/staging/comedi/drivers/gsc_hpdi.c

+49 −51
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ enum board_control_bits { 
	RX_FIFO_RESET_BIT = 0x4,

	TX_ENABLE_BIT = 0x10,

	RX_ENABLE_BIT = 0x20,

	DEMAND_DMA_DIRECTION_TX_BIT = 0x40,	/* for channel 0, channel 1 can only transmit (when present) */

	DEMAND_DMA_DIRECTION_TX_BIT = 0x40,

		/* for ch 0, ch 1 can only transmit (when present) */

	LINE_VALID_ON_STATUS_VALID_BIT = 0x80,

	START_TX_BIT = 0x10,

	CABLE_THROTTLE_ENABLE_BIT = 0x20,
@@ -421,9 +422,11 @@ static void init_plx9080(struct comedi_device *dev) 
	bits |= PLX_DMA_EN_READYIN_BIT;

	/*  enable dma chaining */

	bits |= PLX_EN_CHAIN_BIT;

	/*  enable interrupt on dma done (probably don't need this, since chain never finishes) */

	/*  enable interrupt on dma done

	 *  (probably don't need this, since chain never finishes) */

	bits |= PLX_EN_DMA_DONE_INTR_BIT;

	/*  don't increment local address during transfers (we are transferring from a fixed fifo register) */

	/*  don't increment local address during transfers

	 *  (we are transferring from a fixed fifo register) */

	bits |= PLX_LOCAL_ADDR_CONST_BIT;

	/*  route dma interrupt to pci bus */

	bits |= PLX_DMA_INTR_PCI_BIT;
@@ -680,8 +683,7 @@ static int hpdi_detach(struct comedi_device *dev) 


	if (dev->irq)

		free_irq(dev->irq, dev);

	if (priv(dev)) {

		if (priv(dev)->hw_dev) {

	if ((priv(dev)) && (priv(dev)->hw_dev)) {

		if (priv(dev)->plx9080_iobase) {

			disable_plx_interrupts(dev);

			iounmap((void *)priv(dev)->plx9080_iobase);
@@ -707,12 +709,10 @@ static int hpdi_detach(struct comedi_device *dev) 
					    priv(dev)->dma_desc,

					    priv(dev)->

					    dma_desc_phys_addr);

			if (priv(dev)->hpdi_phys_iobase) {

		if (priv(dev)->hpdi_phys_iobase)

			comedi_pci_disable(priv(dev)->hw_dev);

			}

		pci_dev_put(priv(dev)->hw_dev);

	}

	}

	return 0;

}
@@ -814,17 +814,18 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 
	if (err)

		return 4;



	if (cmd->chanlist) {

	if (!cmd->chanlist)

		return 0;



	for (i = 1; i < cmd->chanlist_len; i++) {

		if (CR_CHAN(cmd->chanlist[i]) != i) {

				/*  XXX could support 8 channels or 16 channels */

			/*  XXX could support 8 or 16 channels */

			comedi_error(dev,

					     "chanlist must be channels 0 to 31 in order");

				     "chanlist must be ch 0 to 31 in order");

			err++;

			break;

		}

	}

	}



	if (err)

		return 5;
@@ -835,9 +836,9 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, 
static int hpdi_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,

			 struct comedi_cmd *cmd)

{

	if (priv(dev)->dio_config_output) {

	if (priv(dev)->dio_config_output)

		return -EINVAL;

	} else

	else

		return di_cmd_test(dev, s, cmd);

}
@@ -903,9 +904,9 @@ static int di_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 


static int hpdi_cmd(struct comedi_device *dev, struct comedi_subdevice *s)

{

	if (priv(dev)->dio_config_output) {

	if (priv(dev)->dio_config_output)

		return -EINVAL;

	} else

	else

		return di_cmd(dev, s);

}
@@ -967,14 +968,12 @@ static irqreturn_t handle_interrupt(int irq, void *d) 
	uint8_t dma0_status, dma1_status;

	unsigned long flags;



	if (!dev->attached) {

	if (!dev->attached)

		return IRQ_NONE;

	}



	plx_status = readl(priv(dev)->plx9080_iobase + PLX_INTRCS_REG);

	if ((plx_status & (ICS_DMA0_A | ICS_DMA1_A | ICS_LIA)) == 0) {

	if ((plx_status & (ICS_DMA0_A | ICS_DMA1_A | ICS_LIA)) == 0)

		return IRQ_NONE;

	}



	hpdi_intr_status = readl(priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG);

	hpdi_board_status = readl(priv(dev)->hpdi_iobase + BOARD_STATUS_REG);
@@ -994,9 +993,8 @@ static irqreturn_t handle_interrupt(int irq, void *d) 
		       priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);



		DEBUG_PRINT("dma0 status 0x%x\n", dma0_status);

		if (dma0_status & PLX_DMA_EN_BIT) {

		if (dma0_status & PLX_DMA_EN_BIT)

			drain_dma_buffers(dev, 0);

		}

		DEBUG_PRINT(" cleared dma ch0 interrupt\n");

	}

	spin_unlock_irqrestore(&dev->spinlock, flags);