From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755814AbcEQKO0 (ORCPT ); Tue, 17 May 2016 06:14:26 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33852 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752113AbcEQKOY (ORCPT ); Tue, 17 May 2016 06:14:24 -0400 From: Ravishankar Karkala Mallikarjunayya To: abbotti@mev.co.uk, hsweeten@visionengravers.com, gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ravishankar Karkala Mallikarjunayya Subject: [PATCH 1/2] Staging: comedi: Fix WARNING issue in s626.c Date: Tue, 17 May 2016 15:43:58 +0530 Message-Id: <1463480039-29963-2-git-send-email-ravishankarkm32@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463480039-29963-1-git-send-email-ravishankarkm32@gmail.com> References: <1463480039-29963-1-git-send-email-ravishankarkm32@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a patch to the s626.c file that fixes up a Block comments issues found by the checkpatch.pl tool. i.e. Block comments use a trailing */ on a separate line Signed-off-by: Ravishankar Karkala Mallikarjunayya --- drivers/staging/comedi/drivers/s626.c | 60 +++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index c5e0863..0e1f535 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -76,24 +76,38 @@ struct s626_buffer_dma { struct s626_private { uint8_t ai_cmd_running; /* ai_cmd is running */ - unsigned int ai_sample_timer; /* time between samples in - * units of the timer */ + unsigned int ai_sample_timer; /* + * time between samples in + * units of the timer + */ int ai_convert_count; /* conversion counter */ - unsigned int ai_convert_timer; /* time between conversion in - * units of the timer */ - uint16_t counter_int_enabs; /* counter interrupt enable mask - * for MISC2 register */ + unsigned int ai_convert_timer; /* + * time between conversion in + * units of the timer + */ + u16 counter_int_enabs; /* + * counter interrupt enable mask + * for MISC2 register + */ uint8_t adc_items; /* number of items in ADC poll list */ - struct s626_buffer_dma rps_buf; /* DMA buffer used to hold ADC (RPS1) - * program */ - struct s626_buffer_dma ana_buf; /* DMA buffer used to receive ADC data - * and hold DAC data */ - uint32_t *dac_wbuf; /* pointer to logical adrs of DMA buffer - * used to hold DAC data */ + struct s626_buffer_dma rps_buf; /* + * DMA buffer used to hold ADC (RPS1) + * program + */ + struct s626_buffer_dma ana_buf; /* + * DMA buffer used to receive ADC data + * and hold DAC data + */ + u32 *dac_wbuf; /* + * pointer to logical adrs of DMA buffer + * used to hold DAC data + */ uint16_t dacpol; /* image of DAC polarity register */ uint8_t trim_setpoint[12]; /* images of TrimDAC setpoints */ - uint32_t i2c_adrs; /* I2C device address for onboard EEPROM - * (board rev dependent) */ + u32 i2c_adrs; /* + * I2C device address for onboard EEPROM + * (board rev dependent) + */ }; /* Counter overflow/index event flag masks for RDMISC2. */ @@ -571,12 +585,18 @@ static int s626_set_dac(struct comedi_device *dev, * to a non-existent TrimDac channel) that serves to keep the clock * running after the packet has been sent to the target DAC. */ - val = 0x0F000000; /* Continue clock after target DAC data - * (write to non-existent trimdac). */ - val |= 0x00004000; /* Address the two main dual-DAC devices - * (TSL's chip select enables target device). */ - val |= ((uint32_t)(chan & 1) << 15); /* Address the DAC channel - * within the device. */ + val = 0x0F000000; /* + * Continue clock after target DAC data + * (write to non-existent trimdac). + */ + val |= 0x00004000; /* + * Address the two main dual-DAC devices + * (TSL's chip select enables target device). + */ + val |= ((uint32_t)(chan & 1) << 15); /* + * Address the DAC channel + * within the device. + */ val |= (uint32_t)dacdata; /* Include DAC setpoint data. */ return s626_send_dac(dev, val); } -- 1.9.1