Staging: comedi: fix coding style issue in pcl816.c
PATCH 1/1 Staging: comedi: fix coding style issue in pcl816.c
This is a patch to the pcl816.c file that fixes up overlines warnings found by the checkpatch.pl tool
Signed-off-by Brian Acosta <[email protected]>
--- drivers/staging/comedi/drivers/pcl816.c | 115 +++++++++++++++++++++---------- 1 files changed, 77 insertions(+), 38 deletions(-)
drivers/staging/comedi/drivers/pcl816.c +77 -38
@@ -104,16 +104,25 @@ static const struct comedi_lrange range_pcl816 = { 8, { };struct pcl816_board { +/* board name */ +const char *name; +/* len of range list */ +int n_ranges; +/* num of A/D chans in diferencial mode */ +int n_aichan; +/* minimal alllowed delay between samples (in ns) */ +unsigned int ai_ns_min; +/* num of D/A chans */ +int n_aochan; +/* num of DI chans */ +int n_dichan; +/* num of DO chans */ +int n_dochan; +/* default A/D rangelist */ +const struct comedi_lrange *ai_range_type; +/* default D/A rangelist */ +const struct comedi_lrange *ao_range_type; -const char *name;/* board name */ -int n_ranges;/* len of range list */ -int n_aichan;/* num of A/D chans in diferencial mode */ -unsigned int ai_ns_min;/* minimal alllowed delay between samples (in ns) */ -int n_aochan;/* num of D/A chans */ -int n_dichan;/* num of DI chans */ -int n_dochan;/* num of DO chans */ -const struct comedi_lrange *ai_range_type;/* default A/D rangelist */ -const struct comedi_lrange *ao_range_type;/* default D/A rangelist */ unsigned int io_range;/* len of IO space */ unsigned int IRQbits;/* allowed interrupts */ unsigned int DMAbits;/* allowed DMA chans */
@@ -154,8 +163,10 @@ static int pcl816_attach(struct comedi_device *dev,static int pcl816_detach (struct comedi_device *dev);#ifdef unused -static int RTC_lock =0 ;/* RTC lock */ -static int RTC_timer_lock =0 ;/* RTC int lock */ +/* RTC lock */ +static int RTC_lock; +/* RTC int lock */ +static int RTC_timer_lock;#endif static struct comedi_driver driver_pcl816 = {
@@ -190,36 +201,63 @@ struct pcl816_private {unsigned int rtc_iosize;unsigned int rtc_irq;#endif -unsigned long dmabuf[2 ];/* pointers to begin of DMA buffers */ -unsigned int dmapages[2 ];/* len of DMA buffers in PAGE_SIZEs */ -unsigned int hwdmaptr[2 ];/* hardware address of DMA buffers */ -unsigned int hwdmasize[2 ];/* len of DMA buffers in Bytes */ -unsigned int dmasamplsize;/* size in samples hwdmasize[0]/2 */ -unsigned int last_top_dma;/* DMA pointer in last RTC int */ -int next_dma_buf;/* which DMA buffer will be used next round */ -long dma_runs_to_end;/* how many we must permorm DMA transfer to end of record */ -unsigned long last_dma_run;/* how many bytes we must transfer on last DMA page */ - -unsigned int ai_scans;/* len of scanlist */ -unsigned char ai_neverending;/* if=1, then we do neverending record (you must use cancel()) */ -int irq_free;/* 1=have allocated IRQ */ -int irq_blocked;/* 1=IRQ now uses any subdev */ +/* pointers to begin of DMA buffers */ +unsigned long dmabuf[2 ]; +/* len of DMA buffers in PAGE_SIZEs */ +unsigned int dmapages[2 ]; +/* hardware address of DMA buffers */ +unsigned int hwdmaptr[2 ]; +/* len of DMA buffers in Bytes */ +unsigned int hwdmasize[2 ]; +/* size in samples hwdmasize[0]/2 */ +unsigned int dmasamplsize; +/* DMA pointer in last RTC int */ +unsigned int last_top_dma; +/* which DMA buffer will be used next round */ +int next_dma_buf; +/* how many we must permorm DMA transfer to end of record */ +long dma_runs_to_end; +/* how many bytes we must transfer on last DMA page */ +unsigned long last_dma_run; + +/* len of scanlist */ +unsigned int ai_scans; +/* if=1, then we do neverending record (you must use cancel()) */ +unsigned char ai_neverending; +/* 1=have allocated IRQ */ +int irq_free; +/* 1=IRQ now uses any subdev */ +int irq_blocked; +#ifdef unusedint rtc_irq_blocked;/* 1=we now do AI with DMA&RTC */ #endif -int irq_was_now_closed;/* when IRQ finish, there's stored int816_mode for last interrupt */ -int int816_mode;/* who now uses IRQ - 1=AI1 int, 2=AI1 dma, 3=AI3 int, 4AI3 dma */ -struct comedi_subdevice *last_int_sub;/* ptr to subdevice which now finish */ -int ai_act_scan;/* how many scans we finished */ -unsigned int ai_act_chanlist[16 ];/* MUX setting for actual AI operations */ -unsigned int ai_act_chanlist_len;/* how long is actual MUX list */ -unsigned int ai_act_chanlist_pos;/* actual position in MUX list */ -unsigned int ai_n_chan;/* how many channels per scan */ -unsigned int ai_poll_ptr;/* how many sampes transfer poll */ -struct comedi_subdevice *sub_ai;/* ptr to AI subdevice */ +/* when IRQ finish, there's stored int816_mode for last interrupt */ +int irq_was_now_closed; +/* who now uses IRQ - 1=AI1 int, 2=AI1 dma, 3=AI3 int, 4AI3 dma */ +int int816_mode; +/* ptr to subdevice which now finish */ +struct comedi_subdevice *last_int_sub; +/* how many scans we finished */ +int ai_act_scan; + +/* MUX setting for actual AI operations */ +unsigned int ai_act_chanlist[16 ]; +/* how long is actual MUX list */ +unsigned int ai_act_chanlist_len; +/* actual position in MUX list */ +unsigned int ai_act_chanlist_pos; +/* how many channels per scan */ +unsigned int ai_n_chan; +/* how many sampes transfer poll */ +unsigned int ai_poll_ptr; +/* ptr to AI subdevice */ +struct comedi_subdevice *sub_ai;#ifdef unused -struct timer_list rtc_irq_timer;/* timer for RTC sanity check */ -unsigned long rtc_freq;/* RTC int freq */ +/* timer for RTC sanity check */ +struct timer_list rtc_irq_timer; +/* RTC int freq */ +unsigned long rtc_freq;#endif };
@@ -1254,7 +1292,8 @@ no_rtc: devpriv->dmapages[0 ] = pages; devpriv->hwdmaptr[0 ] =virt_to_bus ((void *)devpriv->dmabuf[0 ]); devpriv->hwdmasize[0 ] = (1 << pages) *PAGE_SIZE ; -/* printk("%d %d %ld, ",devpriv->dmapages[0],devpriv->hwdmasize[0],PAGE_SIZE); */ +/* printk("%d %d %ld, ",devpriv->dmapages[0], +devpriv->hwdmasize[0],PAGE_SIZE); */ if (devpriv->dma_rtc ==0 ) {/* we must do duble buff :-( */ devpriv->dmabuf[1 ] =__get_dma_pages (GFP_KERNEL , pages);
Signature · 1 line
1.7.0.4