This is a patch to the s626.c file that fixes up a line over 80 character warning found by the checkpatch.pl tool
Signed-off-by: Ravishankar K Mallikarjunayya <[email protected]> --- drivers/staging/comedi/drivers/s626.c | 77 +++++++++++++++++++------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 23fc64b..de07552 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -149,7 +149,8 @@ struct s626_private { uint16_t CounterIntEnabs; /* Counter interrupt enable mask for MISC2 register. */ uint8_t AdcItems; /* Number of items in ADC poll list. */ - struct bufferDMA RPSBuf; /* DMA buffer used to hold ADC (RPS1) program. */ + /* DMA buffer used to hold ADC (RPS1) program. */ + struct bufferDMA RPSBuf; struct bufferDMA ANABuf; /* DMA buffer used to receive ADC data and hold DAC data. */ uint32_t *pDacWBuf; @@ -785,24 +786,29 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) /* Init GPIO so that ADC Start* is negated. */ WR7146(P_GPIO, GPIO_BASE | GPIO1_HI); - /* IsBoardRevA is a boolean that indicates whether the board is RevA. + /* + * IsBoardRevA is a boolean that indicates whether the board is + * RevA. * - * VERSION 2.01 CHANGE: REV A & B BOARDS NOW SUPPORTED BY DYNAMIC - * EEPROM ADDRESS SELECTION. Initialize the I2C interface, which - * is used to access the onboard serial EEPROM. The EEPROM's I2C - * DeviceAddress is hardwired to a value that is dependent on the - * 626 board revision. On all board revisions, the EEPROM stores - * TrimDAC calibration constants for analog I/O. On RevB and - * higher boards, the DeviceAddress is hardwired to 0 to enable - * the EEPROM to also store the PCI SubVendorID and SubDeviceID; - * this is the address at which the SAA7146 expects a - * configuration EEPROM to reside. On RevA boards, the EEPROM - * device address, which is hardwired to 4, prevents the SAA7146 - * from retrieving PCI sub-IDs, so the SAA7146 uses its built-in - * default values, instead. + * VERSION 2.01 CHANGE: REV A & B BOARDS NOW SUPPORTED BY + * DYNAMIC EEPROM ADDRESS SELECTION. Initialize the I2C + * interface, which is used to access the onboard serial EEPROM. + * The EEPROM's I2C DeviceAddress is hardwired to a value that + * is dependent on the 626 board revision. On all board + * revisions, the EEPROM stores TrimDAC calibration constants + * for analog I/O. On RevB and higher boards, the DeviceAddress + * is hardwired to 0 to enable the EEPROM to also store the PCI + * SubVendorID and SubDeviceID; this is the address at which + * the SAA7146 expects a configuration EEPROM to reside. + * On RevA boards, the EEPROM device address, which is hardwired + * to 4, prevents the SAA7146 from retrieving PCI sub-IDs, + * so the SAA7146 uses its built-in default values, instead. */ - /* devpriv->I2Cards= IsBoardRevA ? 0xA8 : 0xA0; // Set I2C EEPROM */ + /* + * devpriv->I2Cards= IsBoardRevA ? 0xA8 : 0xA0; + * // Set I2C EEPROM + */ /* DeviceType (0xA0) */ /* and DeviceAddress<<1. */ @@ -910,8 +916,10 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->ANABuf.PhysicalBase + (DAC_WDMABUF_OS * sizeof(uint32_t)); - WR7146(P_BASEA2_OUT, (uint32_t) pPhysBuf); /* Buffer base adrs. */ - WR7146(P_PROTA2_OUT, (uint32_t) (pPhysBuf + sizeof(uint32_t))); /* Protection address. */ + /* Buffer base adrs. */ + WR7146(P_BASEA2_OUT, (uint32_t) pPhysBuf); + /* Protection address. */ + WR7146(P_PROTA2_OUT, (uint32_t) (pPhysBuf + sizeof(uint32_t))); /* Cache Audio2's output DMA buffer logical address. This is * where DAC data is buffered for A2 output DMA transfers. */ @@ -930,8 +938,8 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) * to the DAC devices. Slot 0 is a NOP that is used to trap TSL * execution; this permits other slots to be safely modified * without first turning off the TSL sequencer (which is - * apparently impossible to do). Also, SD3 (which is driven by a - * pull-up resistor) is shifted in and stored to the MSB of + * apparently impossible to do). Also, SD3 (which is driven + * by a pull-up resistor) is shifted in and stored to the MSB of * FB_BUFFER2 to be used as evidence that the slot sequence has * not yet finished executing. */ @@ -962,11 +970,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) LoadTrimDACs(dev); LoadTrimDACs(dev); /* Insurance. */ - /* Manually init all gate array hardware in case this is a soft + /* + * Manually init all gate array hardware in case this is a soft * reset (we have no way of determining whether this is a warm - * or cold start). This is necessary because the gate array will - * reset only in response to a PCI hard reset; there is no soft - * reset function. */ + * or cold start). This is necessary because the gate array + * will reset only in response to a PCI hard reset; there is no + * soft reset function. + */ /* Init all DAC outputs to 0V and init all DAC setpoint and * polarity images. @@ -980,9 +990,11 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) */ devpriv->ChargeEnabled = 0; - /* Init image of watchdog timer interval in WRMISC2. This image + /* + * Init image of watchdog timer interval in WRMISC2. This image * maintains the value of the control bits of MISC2 are - * continuously reset to zero as long as the WD timer is disabled. + * continuously reset to zero as long as the WD timer is + * disabled. */ devpriv->WDInterval = 0; @@ -1079,16 +1091,19 @@ static irqreturn_t s626_irq_handler(int irq, void *d) s = dev->subdevices; cmd = &(s->async->cmd); - /* Init ptr to DMA buffer that holds new ADC data. We skip the - * first uint16_t in the buffer because it contains junk data from - * the final ADC of the previous poll list scan. + /* + * Init ptr to DMA buffer that holds new ADC data. We skip the + * first uint16_t in the buffer because it contains junk data + * from the final ADC of the previous poll list scan. */ readaddr = (int32_t *) devpriv->ANABuf.LogicalBase + 1; /* get the data and hand it over to comedi */ for (i = 0; i < (s->async->cmd.chanlist_len); i++) { - /* Convert ADC data to 16-bit integer values and copy to application */ - /* buffer. */ + /* + * Convert ADC data to 16-bit integer values and copy to + * application buffer. + */ tempdata = s626_ai_reg_to_uint((int)*readaddr); readaddr++; -- 1.6.5.2 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
