Staging: comedi drivers patches
A message that is not in the archive (sent off-list or not yet received): Jason Wong <[email protected]
This is me stepinig up after watching a video on Greg KH's presentation in FOSDEM 2010.
All patches here correct brace coding style issue.
There are no dependency between the patches, excpet patch 8 and patch 9, which should be apply in correct order.
[PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue [PATCH 2/9] Staging: comedi: amplc_pci230: fix brace coding style issue [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple brace coding style issue [PATCH 4/9] Staging: comedi: adl_pci9118: fixed multiple brace coding style issue [PATCH 5/9] Staging: comedi: adv_pci1710: fixed multiple brace coding style issue [PATCH 6/9] Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue [PATCH 7/9] Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue [PATCH 8/9] Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
Cheers
-Jason
PATCH 1/9 Staging: comedi: amplc_pci224: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci224.c | 114 ++++++++++++------------ 1 files changed, 57 insertions(+), 57 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +57 -57
@@ -495,9 +495,9 @@ pci224_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s,/* Writing a list of values to an AO channel is probably not * very useful, but that's how the interface is defined. */ -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++)pci224_ao_set_data (dev, chan, range, data[i]); - } +return i; }
@@ -518,9 +518,9 @@ pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, chan =CR_CHAN (insn->chanspec); -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = devpriv->ao_readback[chan]; - } +return i; }
@@ -543,9 +543,9 @@ static void pci224_ao_stop(struct comedi_device *dev, {unsigned long flags; -if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state)) { +if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state))return ; - } +spin_lock_irqsave (&devpriv->ao_spinlock, flags);/* Kill the interrupts. */
@@ -596,11 +596,11 @@ static void pci224_ao_start(struct comedi_device *dev, }else {/* Enable interrupts. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags); -if (cmd->stop_src ==TRIG_EXT ) { +if (cmd->stop_src ==TRIG_EXT ) devpriv->intsce =PCI224_INTR_EXT |PCI224_INTR_DAC ; - }else { +else devpriv->intsce =PCI224_INTR_DAC ; - } +outb (devpriv->intsce, devpriv->iobase1 +PCI224_INT_SCE );spin_unlock_irqrestore (&devpriv->ao_spinlock, flags); }
@@ -629,9 +629,9 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (s->async) / bytes_per_scan;if (!devpriv->ao_stop_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_stop_count) { +if (num_scans > devpriv->ao_stop_count) num_scans = devpriv->ao_stop_count; - } + }/* Determine how much room is in the FIFO (in samples). */
@@ -668,13 +668,13 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, } }/* Determine how many new scans can be put in the FIFO. */ -if (cmd->chanlist_len) { +if (cmd->chanlist_len) room /= cmd->chanlist_len; - } +/* Determine how many scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) { cfc_read_array_from_buffer(s, &devpriv->ao_scan_vals[0],
@@ -717,19 +717,19 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, trig =PCI224_DACCON_TRIG_Z2CT0 ; }else {/* cmd->scan_begin_src == TRIG_EXT */ -if (cmd->scan_begin_arg &CR_INVERT ) { +if (cmd->scan_begin_arg &CR_INVERT ) trig =PCI224_DACCON_TRIG_EXTN ; - }else { +else trig =PCI224_DACCON_TRIG_EXTP ; - } + } devpriv->daccon =COMBINE (devpriv->daccon, trig,PCI224_DACCON_TRIG_MASK );outw (devpriv->daccon, dev->iobase +PCI224_DACCON ); } -if (s->async->events) { +if (s->async->events)comedi_event (dev, s); - } + }/*
@@ -854,9 +854,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, err++; } tmp = cmd->chanlist_len *CONVERT_PERIOD ; -if (tmp <MIN_SCAN_PERIOD ) { +if (tmp <MIN_SCAN_PERIOD ) tmp =MIN_SCAN_PERIOD ; - } +if (cmd->scan_begin_arg < tmp) { cmd->scan_begin_arg = tmp; err++;
@@ -965,9 +965,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, devpriv->cached_div1 = div1; devpriv->cached_div2 = div2; } -if (tmp != cmd->scan_begin_arg) { +if (tmp != cmd->scan_begin_arg) err++; - } + }if (err)
@@ -993,13 +993,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, tmp =0 ;for (n =0 ; n < cmd->chanlist_len; n++) { ch =CR_CHAN (cmd->chanlist[n]); -if (tmp & (1U << ch)) { +if (tmp & (1U << ch)) errors |= dupchan_err; - } + tmp |= (1U << ch); -if (CR_RANGE (cmd->chanlist[n]) != range) { +if (CR_RANGE (cmd->chanlist[n]) != range) errors |= range_err; - } + }if (errors) {if (errors & dupchan_err) {
@@ -1037,9 +1037,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned long flags;/* Cannot handle null/empty chanlist. */ -if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 ) { +if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 )return -EINVAL ; - } +/* Determine which channels are enabled and their load order. */ devpriv->ao_enab =0 ;
@@ -1049,9 +1049,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ao_enab |=1U << ch; rank =0 ;for (j =0 ; j < cmd->chanlist_len; j++) { -if (CR_CHAN (cmd->chanlist[j]) < ch) { +if (CR_CHAN (cmd->chanlist[j]) < ch) rank++; - } + } devpriv->ao_scan_order[rank] = i; }
@@ -1220,9 +1220,9 @@ pci224_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s, offset =32768 ; }/* Munge the data. */ -for (i =0 ; i < length; i++) { +for (i =0 ; i < length; i++) array[i] = (array[i] << shift) - offset; - } + }/*
@@ -1253,15 +1253,15 @@ static irqreturn_t pci224_interrupt(int irq, void *d) cmd = &s->async->cmd;if (valid_intstat &PCI224_INTR_EXT ) { devpriv->intsce &= ~PCI224_INTR_EXT ; -if (cmd->start_src ==TRIG_EXT ) { +if (cmd->start_src ==TRIG_EXT )pci224_ao_start (dev, s); - }else if (cmd->stop_src ==TRIG_EXT ) { +else if (cmd->stop_src ==TRIG_EXT )pci224_ao_stop (dev, s); - } + } -if (valid_intstat &PCI224_INTR_DAC ) { +if (valid_intstat &PCI224_INTR_DAC )pci224_ao_handle_fifo (dev, s); - } + }/* Reenable interrupt sources. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags);
@@ -1380,23 +1380,23 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate readback buffer for AO channels. */ devpriv->ao_readback =kmalloc (sizeof (devpriv->ao_readback[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_readback) { +if (!devpriv->ao_readback)return -ENOMEM ; - } +/* Allocate buffer to hold values for AO channel scan. */ devpriv->ao_scan_vals =kmalloc (sizeof (devpriv->ao_scan_vals[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_vals) { +if (!devpriv->ao_scan_vals)return -ENOMEM ; - } +/* Allocate buffer to hold AO channel scan order. */ devpriv->ao_scan_order =kmalloc (sizeof (devpriv->ao_scan_order[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_order) { +if (!devpriv->ao_scan_order)return -ENOMEM ; - } +/* Disable interrupt sources. */ devpriv->intsce =0 ;
@@ -1444,9 +1444,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table_list = range_table_list =kmalloc (sizeof (struct comedi_lrange *) * s->n_chan,GFP_KERNEL ); -if (!s->range_table_list) { +if (!s->range_table_list)return -ENOMEM ; - } +for (n =2 ; n <3 + s->n_chan; n++) {if (it->options[n] <0 || it->options[n] >1 ) { printk(KERN_WARNING "comedi%d: %s: warning! "
@@ -1458,11 +1458,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (n =0 ; n < s->n_chan; n++) {if (n <COMEDI_NDEVCONFOPTS -3 && it->options[3 + n] ==1 ) { -if (it->options[2 ] ==1 ) { +if (it->options[2 ] ==1 ) range_table_list[n] = &range_pci234_ext; - }else { +else range_table_list[n] = &range_bipolar5; - } + }else {if (it->options[2 ] ==1 ) { range_table_list[n] =
@@ -1505,11 +1505,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO "comedi%d: %s " , dev->minor, dev->board_name);printk ("(pci %s) " ,pci_name (pci_dev)); -if (irq) { +if (irq)printk ("(irq %u%s) " , irq, (dev->irq ?"" :" UNAVAILABLE" )); - }else { +else printk ("(no irq) " ); - } +printk ("attached\n" );
@@ -1528,9 +1528,9 @@ static int pci224_detach(struct comedi_device *dev) {printk (KERN_DEBUG "comedi%d: %s: detach\n" , dev->minor,DRIVER_NAME ); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +if (dev->subdevices) {struct comedi_subdevice *s;
@@ -1543,9 +1543,9 @@ static int pci224_detach(struct comedi_device *dev)kfree (devpriv->ao_scan_vals);kfree (devpriv->ao_scan_order);if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
Signature · 1 line
1.7.0
PATCH 1/9 Staging: comedi: amplc_pci224: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci224.c | 114 ++++++++++++------------ 1 files changed, 57 insertions(+), 57 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +57 -57
@@ -495,9 +495,9 @@ pci224_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s,/* Writing a list of values to an AO channel is probably not * very useful, but that's how the interface is defined. */ -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++)pci224_ao_set_data (dev, chan, range, data[i]); - } +return i; }
@@ -518,9 +518,9 @@ pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, chan =CR_CHAN (insn->chanspec); -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = devpriv->ao_readback[chan]; - } +return i; }
@@ -543,9 +543,9 @@ static void pci224_ao_stop(struct comedi_device *dev, {unsigned long flags; -if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state)) { +if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state))return ; - } +spin_lock_irqsave (&devpriv->ao_spinlock, flags);/* Kill the interrupts. */
@@ -596,11 +596,11 @@ static void pci224_ao_start(struct comedi_device *dev, }else {/* Enable interrupts. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags); -if (cmd->stop_src ==TRIG_EXT ) { +if (cmd->stop_src ==TRIG_EXT ) devpriv->intsce =PCI224_INTR_EXT |PCI224_INTR_DAC ; - }else { +else devpriv->intsce =PCI224_INTR_DAC ; - } +outb (devpriv->intsce, devpriv->iobase1 +PCI224_INT_SCE );spin_unlock_irqrestore (&devpriv->ao_spinlock, flags); }
@@ -629,9 +629,9 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (s->async) / bytes_per_scan;if (!devpriv->ao_stop_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_stop_count) { +if (num_scans > devpriv->ao_stop_count) num_scans = devpriv->ao_stop_count; - } + }/* Determine how much room is in the FIFO (in samples). */
@@ -668,13 +668,13 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, } }/* Determine how many new scans can be put in the FIFO. */ -if (cmd->chanlist_len) { +if (cmd->chanlist_len) room /= cmd->chanlist_len; - } +/* Determine how many scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) { cfc_read_array_from_buffer(s, &devpriv->ao_scan_vals[0],
@@ -717,19 +717,19 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, trig =PCI224_DACCON_TRIG_Z2CT0 ; }else {/* cmd->scan_begin_src == TRIG_EXT */ -if (cmd->scan_begin_arg &CR_INVERT ) { +if (cmd->scan_begin_arg &CR_INVERT ) trig =PCI224_DACCON_TRIG_EXTN ; - }else { +else trig =PCI224_DACCON_TRIG_EXTP ; - } + } devpriv->daccon =COMBINE (devpriv->daccon, trig,PCI224_DACCON_TRIG_MASK );outw (devpriv->daccon, dev->iobase +PCI224_DACCON ); } -if (s->async->events) { +if (s->async->events)comedi_event (dev, s); - } + }/*
@@ -854,9 +854,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, err++; } tmp = cmd->chanlist_len *CONVERT_PERIOD ; -if (tmp <MIN_SCAN_PERIOD ) { +if (tmp <MIN_SCAN_PERIOD ) tmp =MIN_SCAN_PERIOD ; - } +if (cmd->scan_begin_arg < tmp) { cmd->scan_begin_arg = tmp; err++;
@@ -965,9 +965,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, devpriv->cached_div1 = div1; devpriv->cached_div2 = div2; } -if (tmp != cmd->scan_begin_arg) { +if (tmp != cmd->scan_begin_arg) err++; - } + }if (err)
@@ -993,13 +993,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, tmp =0 ;for (n =0 ; n < cmd->chanlist_len; n++) { ch =CR_CHAN (cmd->chanlist[n]); -if (tmp & (1U << ch)) { +if (tmp & (1U << ch)) errors |= dupchan_err; - } + tmp |= (1U << ch); -if (CR_RANGE (cmd->chanlist[n]) != range) { +if (CR_RANGE (cmd->chanlist[n]) != range) errors |= range_err; - } + }if (errors) {if (errors & dupchan_err) {
@@ -1037,9 +1037,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned long flags;/* Cannot handle null/empty chanlist. */ -if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 ) { +if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 )return -EINVAL ; - } +/* Determine which channels are enabled and their load order. */ devpriv->ao_enab =0 ;
@@ -1049,9 +1049,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ao_enab |=1U << ch; rank =0 ;for (j =0 ; j < cmd->chanlist_len; j++) { -if (CR_CHAN (cmd->chanlist[j]) < ch) { +if (CR_CHAN (cmd->chanlist[j]) < ch) rank++; - } + } devpriv->ao_scan_order[rank] = i; }
@@ -1220,9 +1220,9 @@ pci224_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s, offset =32768 ; }/* Munge the data. */ -for (i =0 ; i < length; i++) { +for (i =0 ; i < length; i++) array[i] = (array[i] << shift) - offset; - } + }/*
@@ -1253,15 +1253,15 @@ static irqreturn_t pci224_interrupt(int irq, void *d) cmd = &s->async->cmd;if (valid_intstat &PCI224_INTR_EXT ) { devpriv->intsce &= ~PCI224_INTR_EXT ; -if (cmd->start_src ==TRIG_EXT ) { +if (cmd->start_src ==TRIG_EXT )pci224_ao_start (dev, s); - }else if (cmd->stop_src ==TRIG_EXT ) { +else if (cmd->stop_src ==TRIG_EXT )pci224_ao_stop (dev, s); - } + } -if (valid_intstat &PCI224_INTR_DAC ) { +if (valid_intstat &PCI224_INTR_DAC )pci224_ao_handle_fifo (dev, s); - } + }/* Reenable interrupt sources. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags);
@@ -1380,23 +1380,23 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate readback buffer for AO channels. */ devpriv->ao_readback =kmalloc (sizeof (devpriv->ao_readback[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_readback) { +if (!devpriv->ao_readback)return -ENOMEM ; - } +/* Allocate buffer to hold values for AO channel scan. */ devpriv->ao_scan_vals =kmalloc (sizeof (devpriv->ao_scan_vals[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_vals) { +if (!devpriv->ao_scan_vals)return -ENOMEM ; - } +/* Allocate buffer to hold AO channel scan order. */ devpriv->ao_scan_order =kmalloc (sizeof (devpriv->ao_scan_order[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_order) { +if (!devpriv->ao_scan_order)return -ENOMEM ; - } +/* Disable interrupt sources. */ devpriv->intsce =0 ;
@@ -1444,9 +1444,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table_list = range_table_list =kmalloc (sizeof (struct comedi_lrange *) * s->n_chan,GFP_KERNEL ); -if (!s->range_table_list) { +if (!s->range_table_list)return -ENOMEM ; - } +for (n =2 ; n <3 + s->n_chan; n++) {if (it->options[n] <0 || it->options[n] >1 ) { printk(KERN_WARNING "comedi%d: %s: warning! "
@@ -1458,11 +1458,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (n =0 ; n < s->n_chan; n++) {if (n <COMEDI_NDEVCONFOPTS -3 && it->options[3 + n] ==1 ) { -if (it->options[2 ] ==1 ) { +if (it->options[2 ] ==1 ) range_table_list[n] = &range_pci234_ext; - }else { +else range_table_list[n] = &range_bipolar5; - } + }else {if (it->options[2 ] ==1 ) { range_table_list[n] =
@@ -1505,11 +1505,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO "comedi%d: %s " , dev->minor, dev->board_name);printk ("(pci %s) " ,pci_name (pci_dev)); -if (irq) { +if (irq)printk ("(irq %u%s) " , irq, (dev->irq ?"" :" UNAVAILABLE" )); - }else { +else printk ("(no irq) " ); - } +printk ("attached\n" );
@@ -1528,9 +1528,9 @@ static int pci224_detach(struct comedi_device *dev) {printk (KERN_DEBUG "comedi%d: %s: detach\n" , dev->minor,DRIVER_NAME ); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +if (dev->subdevices) {struct comedi_subdevice *s;
@@ -1543,9 +1543,9 @@ static int pci224_detach(struct comedi_device *dev)kfree (devpriv->ao_scan_vals);kfree (devpriv->ao_scan_order);if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
Signature · 1 line
1.7.0.2
PATCH 1/9 Staging: comedi: amplc_pci224: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci224.c | 114 ++++++++++++------------ 1 files changed, 57 insertions(+), 57 deletions(-)
drivers/staging/comedi/drivers/amplc_pci224.c +57 -57
@@ -495,9 +495,9 @@ pci224_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s,/* Writing a list of values to an AO channel is probably not * very useful, but that's how the interface is defined. */ -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++)pci224_ao_set_data (dev, chan, range, data[i]); - } +return i; }
@@ -518,9 +518,9 @@ pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, chan =CR_CHAN (insn->chanspec); -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = devpriv->ao_readback[chan]; - } +return i; }
@@ -543,9 +543,9 @@ static void pci224_ao_stop(struct comedi_device *dev, {unsigned long flags; -if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state)) { +if (!test_and_clear_bit (AO_CMD_STARTED , &devpriv->state))return ; - } +spin_lock_irqsave (&devpriv->ao_spinlock, flags);/* Kill the interrupts. */
@@ -596,11 +596,11 @@ static void pci224_ao_start(struct comedi_device *dev, }else {/* Enable interrupts. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags); -if (cmd->stop_src ==TRIG_EXT ) { +if (cmd->stop_src ==TRIG_EXT ) devpriv->intsce =PCI224_INTR_EXT |PCI224_INTR_DAC ; - }else { +else devpriv->intsce =PCI224_INTR_DAC ; - } +outb (devpriv->intsce, devpriv->iobase1 +PCI224_INT_SCE );spin_unlock_irqrestore (&devpriv->ao_spinlock, flags); }
@@ -629,9 +629,9 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (s->async) / bytes_per_scan;if (!devpriv->ao_stop_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_stop_count) { +if (num_scans > devpriv->ao_stop_count) num_scans = devpriv->ao_stop_count; - } + }/* Determine how much room is in the FIFO (in samples). */
@@ -668,13 +668,13 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, } }/* Determine how many new scans can be put in the FIFO. */ -if (cmd->chanlist_len) { +if (cmd->chanlist_len) room /= cmd->chanlist_len; - } +/* Determine how many scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) { cfc_read_array_from_buffer(s, &devpriv->ao_scan_vals[0],
@@ -717,19 +717,19 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev, trig =PCI224_DACCON_TRIG_Z2CT0 ; }else {/* cmd->scan_begin_src == TRIG_EXT */ -if (cmd->scan_begin_arg &CR_INVERT ) { +if (cmd->scan_begin_arg &CR_INVERT ) trig =PCI224_DACCON_TRIG_EXTN ; - }else { +else trig =PCI224_DACCON_TRIG_EXTP ; - } + } devpriv->daccon =COMBINE (devpriv->daccon, trig,PCI224_DACCON_TRIG_MASK );outw (devpriv->daccon, dev->iobase +PCI224_DACCON ); } -if (s->async->events) { +if (s->async->events)comedi_event (dev, s); - } + }/*
@@ -854,9 +854,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, err++; } tmp = cmd->chanlist_len *CONVERT_PERIOD ; -if (tmp <MIN_SCAN_PERIOD ) { +if (tmp <MIN_SCAN_PERIOD ) tmp =MIN_SCAN_PERIOD ; - } +if (cmd->scan_begin_arg < tmp) { cmd->scan_begin_arg = tmp; err++;
@@ -965,9 +965,9 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, devpriv->cached_div1 = div1; devpriv->cached_div2 = div2; } -if (tmp != cmd->scan_begin_arg) { +if (tmp != cmd->scan_begin_arg) err++; - } + }if (err)
@@ -993,13 +993,13 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, tmp =0 ;for (n =0 ; n < cmd->chanlist_len; n++) { ch =CR_CHAN (cmd->chanlist[n]); -if (tmp & (1U << ch)) { +if (tmp & (1U << ch)) errors |= dupchan_err; - } + tmp |= (1U << ch); -if (CR_RANGE (cmd->chanlist[n]) != range) { +if (CR_RANGE (cmd->chanlist[n]) != range) errors |= range_err; - } + }if (errors) {if (errors & dupchan_err) {
@@ -1037,9 +1037,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned long flags;/* Cannot handle null/empty chanlist. */ -if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 ) { +if (cmd->chanlist ==NULL || cmd->chanlist_len ==0 )return -EINVAL ; - } +/* Determine which channels are enabled and their load order. */ devpriv->ao_enab =0 ;
@@ -1049,9 +1049,9 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ao_enab |=1U << ch; rank =0 ;for (j =0 ; j < cmd->chanlist_len; j++) { -if (CR_CHAN (cmd->chanlist[j]) < ch) { +if (CR_CHAN (cmd->chanlist[j]) < ch) rank++; - } + } devpriv->ao_scan_order[rank] = i; }
@@ -1220,9 +1220,9 @@ pci224_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s, offset =32768 ; }/* Munge the data. */ -for (i =0 ; i < length; i++) { +for (i =0 ; i < length; i++) array[i] = (array[i] << shift) - offset; - } + }/*
@@ -1253,15 +1253,15 @@ static irqreturn_t pci224_interrupt(int irq, void *d) cmd = &s->async->cmd;if (valid_intstat &PCI224_INTR_EXT ) { devpriv->intsce &= ~PCI224_INTR_EXT ; -if (cmd->start_src ==TRIG_EXT ) { +if (cmd->start_src ==TRIG_EXT )pci224_ao_start (dev, s); - }else if (cmd->stop_src ==TRIG_EXT ) { +else if (cmd->stop_src ==TRIG_EXT )pci224_ao_stop (dev, s); - } + } -if (valid_intstat &PCI224_INTR_DAC ) { +if (valid_intstat &PCI224_INTR_DAC )pci224_ao_handle_fifo (dev, s); - } + }/* Reenable interrupt sources. */ spin_lock_irqsave (&devpriv->ao_spinlock, flags);
@@ -1380,23 +1380,23 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate readback buffer for AO channels. */ devpriv->ao_readback =kmalloc (sizeof (devpriv->ao_readback[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_readback) { +if (!devpriv->ao_readback)return -ENOMEM ; - } +/* Allocate buffer to hold values for AO channel scan. */ devpriv->ao_scan_vals =kmalloc (sizeof (devpriv->ao_scan_vals[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_vals) { +if (!devpriv->ao_scan_vals)return -ENOMEM ; - } +/* Allocate buffer to hold AO channel scan order. */ devpriv->ao_scan_order =kmalloc (sizeof (devpriv->ao_scan_order[0 ]) * thisboard->ao_chans,GFP_KERNEL ); -if (!devpriv->ao_scan_order) { +if (!devpriv->ao_scan_order)return -ENOMEM ; - } +/* Disable interrupt sources. */ devpriv->intsce =0 ;
@@ -1444,9 +1444,9 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->range_table_list = range_table_list =kmalloc (sizeof (struct comedi_lrange *) * s->n_chan,GFP_KERNEL ); -if (!s->range_table_list) { +if (!s->range_table_list)return -ENOMEM ; - } +for (n =2 ; n <3 + s->n_chan; n++) {if (it->options[n] <0 || it->options[n] >1 ) { printk(KERN_WARNING "comedi%d: %s: warning! "
@@ -1458,11 +1458,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)for (n =0 ; n < s->n_chan; n++) {if (n <COMEDI_NDEVCONFOPTS -3 && it->options[3 + n] ==1 ) { -if (it->options[2 ] ==1 ) { +if (it->options[2 ] ==1 ) range_table_list[n] = &range_pci234_ext; - }else { +else range_table_list[n] = &range_bipolar5; - } + }else {if (it->options[2 ] ==1 ) { range_table_list[n] =
@@ -1505,11 +1505,11 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (KERN_INFO "comedi%d: %s " , dev->minor, dev->board_name);printk ("(pci %s) " ,pci_name (pci_dev)); -if (irq) { +if (irq)printk ("(irq %u%s) " , irq, (dev->irq ?"" :" UNAVAILABLE" )); - }else { +else printk ("(no irq) " ); - } +printk ("attached\n" );
@@ -1528,9 +1528,9 @@ static int pci224_detach(struct comedi_device *dev) {printk (KERN_DEBUG "comedi%d: %s: detach\n" , dev->minor,DRIVER_NAME ); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +if (dev->subdevices) {struct comedi_subdevice *s;
@@ -1543,9 +1543,9 @@ static int pci224_detach(struct comedi_device *dev)kfree (devpriv->ao_scan_vals);kfree (devpriv->ao_scan_order);if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
Signature · 1 line
1.7.0.3
PATCH 2/9 Staging: comedi: amplc_pci230: fix brace coding style issue
In reply to a message not in the archiveFixed multiple brace coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci230.c | 132 ++++++++++++------------ 1 files changed, 66 insertions(+), 66 deletions(-)
drivers/staging/comedi/drivers/amplc_pci230.c +66 -66
@@ -669,9 +669,9 @@ static short pci230_ai_read(struct comedi_device *dev)/* If a bipolar range was specified, mangle it (twos * complement->straight binary). */ -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) data ^=1 << (thisboard->ai_bits -1 ); - } +return data; }
@@ -680,9 +680,9 @@ static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev, {/* If a bipolar range was specified, mangle it (straight binary->twos * complement). */ -if (devpriv->ao_bipolar) { +if (devpriv->ao_bipolar) datum ^=1 << (thisboard->ao_bits -1 ); - } +/* PCI230 is 12 bit - stored in upper bits of 16 bit register (lower * four bits reserved for expansion). */
@@ -734,9 +734,9 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate the private structure area using alloc_private(). * Macro defined in comedidev.h - memsets struct fields to 0. */ -if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 ) { +if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 )return -ENOMEM ; - } +spin_lock_init (&devpriv->isr_spinlock);spin_lock_init (&devpriv->res_spinlock);spin_lock_init (&devpriv->ai_stop_spinlock);
@@ -991,9 +991,9 @@ static int pci230_detach(struct comedi_device *dev)if (devpriv) {if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
@@ -1055,9 +1055,9 @@ static void put_resources(struct comedi_device *dev, unsigned int res_mask, && (res_mask != 0); b <<= 1, i++) {if ((res_mask & b) !=0 ) { res_mask &= ~b; -if (devpriv->res_owner[i] == owner) { +if (devpriv->res_owner[i] == owner) devpriv->res_owner[i] =OWNER_NONE ; - } + } }spin_unlock_irqrestore (&devpriv->res_spinlock, irqflags);
@@ -1132,11 +1132,11 @@ static int pci230_ai_rinsn(struct comedi_device *dev, } devpriv->adcg = (devpriv->adcg & ~(3 << gainshift)) | (pci230_ai_gain[range] << gainshift); -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +/* Enable only this channel in the scan list - otherwise by default * we'll get one sample from each channel. */
@@ -1408,13 +1408,13 @@ static int pci230_ao_cmdtest(struct comedi_device *dev, chan =CR_CHAN (cmd->chanlist[n]); range =CR_RANGE (cmd->chanlist[n]);/* Channel numbers must strictly increase. */ -if (chan < prev_chan) { +if (chan < prev_chan) errors |= seq_err; - } +/* Ranges must be the same. */ -if (range != first_range) { +if (range != first_range) errors |= range_err; - } + prev_chan = chan; }if (errors !=0 ) {
@@ -1583,9 +1583,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (cmd->scan_begin_src ==TRIG_TIMER ) {/* Claim Z2-CT1. */ -if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD )) { +if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD ))return -EBUSY ; - } + }/* Get number of scans required. */
@@ -1609,9 +1609,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned int i; dacen =0 ; -for (i =0 ; i < cmd->chanlist_len; i++) { +for (i =0 ; i < cmd->chanlist_len; i++) dacen |=1 <<CR_CHAN (cmd->chanlist[i]); - } +/* Set channel scan list. */ outw (dacen, dev->iobase +PCI230P2_DACEN );/*
@@ -1656,9 +1656,9 @@ static int pci230_ai_check_scan_period(struct comedi_cmd *cmd)int err =0 ; chanlist_len = cmd->chanlist_len; -if (cmd->chanlist_len ==0 ) { +if (cmd->chanlist_len ==0 ) chanlist_len =1 ; - } + min_scan_period = chanlist_len * cmd->convert_arg;if ((min_scan_period < chanlist_len) || (min_scan_period < cmd->convert_arg)) {
@@ -1777,11 +1777,11 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,* single-ended or pseudo-differential. */ if (cmd->chanlist && (cmd->chanlist_len >0 )) {/* Peek analogue reference of first channel. */ -if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) { +if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) max_speed_ai =MAX_SPEED_AI_DIFF ; - }else { +else max_speed_ai =MAX_SPEED_AI_SE ; - } + }else {/* No channel list. Assume single-ended. */ max_speed_ai =MAX_SPEED_AI_SE ;
@@ -1871,9 +1871,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, } }else if (cmd->scan_begin_src ==TRIG_TIMER ) {/* N.B. cmd->convert_arg is also TRIG_TIMER */ -if (!pci230_ai_check_scan_period (cmd)) { +if (!pci230_ai_check_scan_period (cmd)) err++; - } + }else {if (cmd->scan_begin_arg !=0 ) { cmd->scan_begin_arg =0 ;
@@ -1961,13 +1961,13 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, errors |= seq_err; }/* Channels must have same AREF. */ -if (aref != prev_aref) { +if (aref != prev_aref) errors |= aref_err; - } +/* Channel ranges must have same polarity. */ -if (polarity != prev_polarity) { +if (polarity != prev_polarity) errors |= polarity_err; - } +/* Single-ended channel pairs must have same * range. */ if ((aref != AREF_DIFF)
@@ -1987,9 +1987,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, }/* If channel list is a repeating subsequence, need a whole * number of repeats. */ -if ((n % subseq_len) !=0 ) { +if ((n % subseq_len) !=0 ) errors |= seq_err; - } +if ((devpriv->hwver >0 ) && (devpriv->hwver <4 )) {/* * Buggy PCI230+ or PCI260+ requires channel 0 to be
@@ -2228,9 +2228,9 @@ static void pci230_ai_start(struct comedi_device *dev, devpriv->adccon = (devpriv->adccon & ~PCI230_ADC_TRIG_MASK ) | conv;outw (devpriv->adccon, dev->iobase +PCI230_ADCCON ); -if (cmd->convert_src ==TRIG_INT ) { +if (cmd->convert_src ==TRIG_INT ) async->inttrig = pci230_ai_inttrig_convert; - } +/* Update FIFO interrupt trigger level, which is currently * set to "full". */ pci230_ai_update_fifo_trigger_level (dev, s);
@@ -2345,9 +2345,9 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } }/* Claim resources. */ -if (!get_resources (dev, res_mask,OWNER_AICMD )) { +if (!get_resources (dev, res_mask,OWNER_AICMD ))return -EBUSY ; - } +/* Get number of scans required. */ if (cmd->stop_src ==TRIG_COUNT ) {
@@ -2392,11 +2392,11 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) range =CR_RANGE (cmd->chanlist[0 ]); devpriv->ai_bipolar = pci230_ai_bipolar[range]; -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {unsigned int gainshift;
@@ -2543,9 +2543,9 @@ static unsigned int pci230_choose_clk_count(uint64_t ns, unsigned int *count,for (clk_src =CLK_10MHZ ;; clk_src++) { cnt =divide_ns (ns, pci230_timebase[clk_src], round_mode); -if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ )) { +if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ ))break ; - } + } *count = cnt;return clk_src;
@@ -2575,9 +2575,9 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct,/* Program clock source. */ outb (CLK_CONFIG (ct, clk_src), devpriv->iobase1 +PCI230_ZCLK_SCE );/* Set initial count. */ -if (count >=65536 ) { +if (count >=65536 ) count =0 ; - } +i8254_write (devpriv->iobase1 +PCI230_Z2_CT_BASE ,0 , ct, count); }
@@ -2599,9 +2599,9 @@ static irqreturn_t pci230_interrupt(int irq, void *d)/* Read interrupt status/enable register. */ status_int =inb (devpriv->iobase1 +PCI230_INT_STAT ); -if (status_int ==PCI230_INT_DISABLE ) { +if (status_int ==PCI230_INT_DISABLE )return IRQ_NONE ; - } +spin_lock_irqsave (&devpriv->isr_spinlock, irqflags); valid_status_int = devpriv->int_en & status_int;
@@ -2660,9 +2660,9 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,struct comedi_async *async = s->async;struct comedi_cmd *cmd = &async->cmd; -if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 )) { +if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 ))return ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {/* Read sample from Comedi's circular buffer. */
@@ -2711,9 +2711,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (async) / bytes_per_scan;if (!devpriv->ao_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_scan_count) { +if (num_scans > devpriv->ao_scan_count) num_scans = devpriv->ao_scan_count; - } +if (devpriv->ao_scan_count ==0 ) {/* End of acquisition. */ events |=COMEDI_CB_EOA ;
@@ -2736,21 +2736,21 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, }if (events ==0 ) {/* Determine how much room is in the FIFO (in samples). */ -if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) { +if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) room =PCI230P2_DAC_FIFOROOM_FULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) room =PCI230P2_DAC_FIFOROOM_HALFTOFULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) room =PCI230P2_DAC_FIFOROOM_EMPTY ; - }else { +else room =PCI230P2_DAC_FIFOROOM_ONETOHALF ; - } +/* Convert room to number of scans that can be added. */ room /= cmd->chanlist_len;/* Determine number of scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) {for (i =0 ; i < cmd->chanlist_len; i++) {
@@ -2817,14 +2817,14 @@ static void pci230_handle_ai(struct comedi_device *dev, }else { todo = (devpriv->ai_scan_count * scanlen) - devpriv->ai_scan_pos; -if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) { +if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) todo =PCI230_ADC_FIFOLEVEL_HALFFULL ; - } + } -if (todo ==0 ) { +if (todo ==0 )return ; - } + fifoamount =0 ;for (i =0 ; i < todo; i++) {
@@ -2906,9 +2906,9 @@ static void pci230_ao_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ao_stop_spinlock, irqflags); started =test_and_clear_bit (AO_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ao_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->scan_begin_src ==TRIG_TIMER ) {
@@ -2968,9 +2968,9 @@ static void pci230_ai_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ai_stop_spinlock, irqflags); started =test_and_clear_bit (AI_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ai_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->convert_src ==TRIG_TIMER ) {
Signature · 1 line
1.7.0
PATCH 2/9 Staging: comedi: amplc_pci230: fix brace coding style issue
In reply to a message not in the archiveFixed multiple brace coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci230.c | 132 ++++++++++++------------ 1 files changed, 66 insertions(+), 66 deletions(-)
drivers/staging/comedi/drivers/amplc_pci230.c +66 -66
@@ -669,9 +669,9 @@ static short pci230_ai_read(struct comedi_device *dev)/* If a bipolar range was specified, mangle it (twos * complement->straight binary). */ -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) data ^=1 << (thisboard->ai_bits -1 ); - } +return data; }
@@ -680,9 +680,9 @@ static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev, {/* If a bipolar range was specified, mangle it (straight binary->twos * complement). */ -if (devpriv->ao_bipolar) { +if (devpriv->ao_bipolar) datum ^=1 << (thisboard->ao_bits -1 ); - } +/* PCI230 is 12 bit - stored in upper bits of 16 bit register (lower * four bits reserved for expansion). */
@@ -734,9 +734,9 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate the private structure area using alloc_private(). * Macro defined in comedidev.h - memsets struct fields to 0. */ -if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 ) { +if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 )return -ENOMEM ; - } +spin_lock_init (&devpriv->isr_spinlock);spin_lock_init (&devpriv->res_spinlock);spin_lock_init (&devpriv->ai_stop_spinlock);
@@ -991,9 +991,9 @@ static int pci230_detach(struct comedi_device *dev)if (devpriv) {if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
@@ -1055,9 +1055,9 @@ static void put_resources(struct comedi_device *dev, unsigned int res_mask, && (res_mask != 0); b <<= 1, i++) {if ((res_mask & b) !=0 ) { res_mask &= ~b; -if (devpriv->res_owner[i] == owner) { +if (devpriv->res_owner[i] == owner) devpriv->res_owner[i] =OWNER_NONE ; - } + } }spin_unlock_irqrestore (&devpriv->res_spinlock, irqflags);
@@ -1132,11 +1132,11 @@ static int pci230_ai_rinsn(struct comedi_device *dev, } devpriv->adcg = (devpriv->adcg & ~(3 << gainshift)) | (pci230_ai_gain[range] << gainshift); -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +/* Enable only this channel in the scan list - otherwise by default * we'll get one sample from each channel. */
@@ -1408,13 +1408,13 @@ static int pci230_ao_cmdtest(struct comedi_device *dev, chan =CR_CHAN (cmd->chanlist[n]); range =CR_RANGE (cmd->chanlist[n]);/* Channel numbers must strictly increase. */ -if (chan < prev_chan) { +if (chan < prev_chan) errors |= seq_err; - } +/* Ranges must be the same. */ -if (range != first_range) { +if (range != first_range) errors |= range_err; - } + prev_chan = chan; }if (errors !=0 ) {
@@ -1583,9 +1583,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (cmd->scan_begin_src ==TRIG_TIMER ) {/* Claim Z2-CT1. */ -if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD )) { +if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD ))return -EBUSY ; - } + }/* Get number of scans required. */
@@ -1609,9 +1609,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned int i; dacen =0 ; -for (i =0 ; i < cmd->chanlist_len; i++) { +for (i =0 ; i < cmd->chanlist_len; i++) dacen |=1 <<CR_CHAN (cmd->chanlist[i]); - } +/* Set channel scan list. */ outw (dacen, dev->iobase +PCI230P2_DACEN );/*
@@ -1656,9 +1656,9 @@ static int pci230_ai_check_scan_period(struct comedi_cmd *cmd)int err =0 ; chanlist_len = cmd->chanlist_len; -if (cmd->chanlist_len ==0 ) { +if (cmd->chanlist_len ==0 ) chanlist_len =1 ; - } + min_scan_period = chanlist_len * cmd->convert_arg;if ((min_scan_period < chanlist_len) || (min_scan_period < cmd->convert_arg)) {
@@ -1777,11 +1777,11 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,* single-ended or pseudo-differential. */ if (cmd->chanlist && (cmd->chanlist_len >0 )) {/* Peek analogue reference of first channel. */ -if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) { +if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) max_speed_ai =MAX_SPEED_AI_DIFF ; - }else { +else max_speed_ai =MAX_SPEED_AI_SE ; - } + }else {/* No channel list. Assume single-ended. */ max_speed_ai =MAX_SPEED_AI_SE ;
@@ -1871,9 +1871,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, } }else if (cmd->scan_begin_src ==TRIG_TIMER ) {/* N.B. cmd->convert_arg is also TRIG_TIMER */ -if (!pci230_ai_check_scan_period (cmd)) { +if (!pci230_ai_check_scan_period (cmd)) err++; - } + }else {if (cmd->scan_begin_arg !=0 ) { cmd->scan_begin_arg =0 ;
@@ -1961,13 +1961,13 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, errors |= seq_err; }/* Channels must have same AREF. */ -if (aref != prev_aref) { +if (aref != prev_aref) errors |= aref_err; - } +/* Channel ranges must have same polarity. */ -if (polarity != prev_polarity) { +if (polarity != prev_polarity) errors |= polarity_err; - } +/* Single-ended channel pairs must have same * range. */ if ((aref != AREF_DIFF)
@@ -1987,9 +1987,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, }/* If channel list is a repeating subsequence, need a whole * number of repeats. */ -if ((n % subseq_len) !=0 ) { +if ((n % subseq_len) !=0 ) errors |= seq_err; - } +if ((devpriv->hwver >0 ) && (devpriv->hwver <4 )) {/* * Buggy PCI230+ or PCI260+ requires channel 0 to be
@@ -2228,9 +2228,9 @@ static void pci230_ai_start(struct comedi_device *dev, devpriv->adccon = (devpriv->adccon & ~PCI230_ADC_TRIG_MASK ) | conv;outw (devpriv->adccon, dev->iobase +PCI230_ADCCON ); -if (cmd->convert_src ==TRIG_INT ) { +if (cmd->convert_src ==TRIG_INT ) async->inttrig = pci230_ai_inttrig_convert; - } +/* Update FIFO interrupt trigger level, which is currently * set to "full". */ pci230_ai_update_fifo_trigger_level (dev, s);
@@ -2345,9 +2345,9 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } }/* Claim resources. */ -if (!get_resources (dev, res_mask,OWNER_AICMD )) { +if (!get_resources (dev, res_mask,OWNER_AICMD ))return -EBUSY ; - } +/* Get number of scans required. */ if (cmd->stop_src ==TRIG_COUNT ) {
@@ -2392,11 +2392,11 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) range =CR_RANGE (cmd->chanlist[0 ]); devpriv->ai_bipolar = pci230_ai_bipolar[range]; -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {unsigned int gainshift;
@@ -2543,9 +2543,9 @@ static unsigned int pci230_choose_clk_count(uint64_t ns, unsigned int *count,for (clk_src =CLK_10MHZ ;; clk_src++) { cnt =divide_ns (ns, pci230_timebase[clk_src], round_mode); -if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ )) { +if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ ))break ; - } + } *count = cnt;return clk_src;
@@ -2575,9 +2575,9 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct,/* Program clock source. */ outb (CLK_CONFIG (ct, clk_src), devpriv->iobase1 +PCI230_ZCLK_SCE );/* Set initial count. */ -if (count >=65536 ) { +if (count >=65536 ) count =0 ; - } +i8254_write (devpriv->iobase1 +PCI230_Z2_CT_BASE ,0 , ct, count); }
@@ -2599,9 +2599,9 @@ static irqreturn_t pci230_interrupt(int irq, void *d)/* Read interrupt status/enable register. */ status_int =inb (devpriv->iobase1 +PCI230_INT_STAT ); -if (status_int ==PCI230_INT_DISABLE ) { +if (status_int ==PCI230_INT_DISABLE )return IRQ_NONE ; - } +spin_lock_irqsave (&devpriv->isr_spinlock, irqflags); valid_status_int = devpriv->int_en & status_int;
@@ -2660,9 +2660,9 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,struct comedi_async *async = s->async;struct comedi_cmd *cmd = &async->cmd; -if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 )) { +if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 ))return ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {/* Read sample from Comedi's circular buffer. */
@@ -2711,9 +2711,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (async) / bytes_per_scan;if (!devpriv->ao_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_scan_count) { +if (num_scans > devpriv->ao_scan_count) num_scans = devpriv->ao_scan_count; - } +if (devpriv->ao_scan_count ==0 ) {/* End of acquisition. */ events |=COMEDI_CB_EOA ;
@@ -2736,21 +2736,21 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, }if (events ==0 ) {/* Determine how much room is in the FIFO (in samples). */ -if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) { +if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) room =PCI230P2_DAC_FIFOROOM_FULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) room =PCI230P2_DAC_FIFOROOM_HALFTOFULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) room =PCI230P2_DAC_FIFOROOM_EMPTY ; - }else { +else room =PCI230P2_DAC_FIFOROOM_ONETOHALF ; - } +/* Convert room to number of scans that can be added. */ room /= cmd->chanlist_len;/* Determine number of scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) {for (i =0 ; i < cmd->chanlist_len; i++) {
@@ -2817,14 +2817,14 @@ static void pci230_handle_ai(struct comedi_device *dev, }else { todo = (devpriv->ai_scan_count * scanlen) - devpriv->ai_scan_pos; -if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) { +if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) todo =PCI230_ADC_FIFOLEVEL_HALFFULL ; - } + } -if (todo ==0 ) { +if (todo ==0 )return ; - } + fifoamount =0 ;for (i =0 ; i < todo; i++) {
@@ -2906,9 +2906,9 @@ static void pci230_ao_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ao_stop_spinlock, irqflags); started =test_and_clear_bit (AO_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ao_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->scan_begin_src ==TRIG_TIMER ) {
@@ -2968,9 +2968,9 @@ static void pci230_ai_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ai_stop_spinlock, irqflags); started =test_and_clear_bit (AI_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ai_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->convert_src ==TRIG_TIMER ) {
Signature · 1 line
1.7.0.2
PATCH 2/9 Staging: comedi: amplc_pci230: fix brace coding style issue
In reply to a message not in the archiveFixed multiple brace coding style issue.
--- drivers/staging/comedi/drivers/amplc_pci230.c | 132 ++++++++++++------------ 1 files changed, 66 insertions(+), 66 deletions(-)
drivers/staging/comedi/drivers/amplc_pci230.c +66 -66
@@ -669,9 +669,9 @@ static short pci230_ai_read(struct comedi_device *dev)/* If a bipolar range was specified, mangle it (twos * complement->straight binary). */ -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) data ^=1 << (thisboard->ai_bits -1 ); - } +return data; }
@@ -680,9 +680,9 @@ static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev, {/* If a bipolar range was specified, mangle it (straight binary->twos * complement). */ -if (devpriv->ao_bipolar) { +if (devpriv->ao_bipolar) datum ^=1 << (thisboard->ao_bits -1 ); - } +/* PCI230 is 12 bit - stored in upper bits of 16 bit register (lower * four bits reserved for expansion). */
@@ -734,9 +734,9 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)/* Allocate the private structure area using alloc_private(). * Macro defined in comedidev.h - memsets struct fields to 0. */ -if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 ) { +if ((alloc_private (dev,sizeof (struct pci230_private ))) <0 )return -ENOMEM ; - } +spin_lock_init (&devpriv->isr_spinlock);spin_lock_init (&devpriv->res_spinlock);spin_lock_init (&devpriv->ai_stop_spinlock);
@@ -991,9 +991,9 @@ static int pci230_detach(struct comedi_device *dev)if (devpriv) {if (devpriv->pci_dev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pci_dev); - } +pci_dev_put (devpriv->pci_dev); } }
@@ -1055,9 +1055,9 @@ static void put_resources(struct comedi_device *dev, unsigned int res_mask, && (res_mask != 0); b <<= 1, i++) {if ((res_mask & b) !=0 ) { res_mask &= ~b; -if (devpriv->res_owner[i] == owner) { +if (devpriv->res_owner[i] == owner) devpriv->res_owner[i] =OWNER_NONE ; - } + } }spin_unlock_irqrestore (&devpriv->res_spinlock, irqflags);
@@ -1132,11 +1132,11 @@ static int pci230_ai_rinsn(struct comedi_device *dev, } devpriv->adcg = (devpriv->adcg & ~(3 << gainshift)) | (pci230_ai_gain[range] << gainshift); -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +/* Enable only this channel in the scan list - otherwise by default * we'll get one sample from each channel. */
@@ -1408,13 +1408,13 @@ static int pci230_ao_cmdtest(struct comedi_device *dev, chan =CR_CHAN (cmd->chanlist[n]); range =CR_RANGE (cmd->chanlist[n]);/* Channel numbers must strictly increase. */ -if (chan < prev_chan) { +if (chan < prev_chan) errors |= seq_err; - } +/* Ranges must be the same. */ -if (range != first_range) { +if (range != first_range) errors |= range_err; - } + prev_chan = chan; }if (errors !=0 ) {
@@ -1583,9 +1583,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)if (cmd->scan_begin_src ==TRIG_TIMER ) {/* Claim Z2-CT1. */ -if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD )) { +if (!get_one_resource (dev,RES_Z2CT1 ,OWNER_AOCMD ))return -EBUSY ; - } + }/* Get number of scans required. */
@@ -1609,9 +1609,9 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)unsigned int i; dacen =0 ; -for (i =0 ; i < cmd->chanlist_len; i++) { +for (i =0 ; i < cmd->chanlist_len; i++) dacen |=1 <<CR_CHAN (cmd->chanlist[i]); - } +/* Set channel scan list. */ outw (dacen, dev->iobase +PCI230P2_DACEN );/*
@@ -1656,9 +1656,9 @@ static int pci230_ai_check_scan_period(struct comedi_cmd *cmd)int err =0 ; chanlist_len = cmd->chanlist_len; -if (cmd->chanlist_len ==0 ) { +if (cmd->chanlist_len ==0 ) chanlist_len =1 ; - } + min_scan_period = chanlist_len * cmd->convert_arg;if ((min_scan_period < chanlist_len) || (min_scan_period < cmd->convert_arg)) {
@@ -1777,11 +1777,11 @@ static int pci230_ai_cmdtest(struct comedi_device *dev,* single-ended or pseudo-differential. */ if (cmd->chanlist && (cmd->chanlist_len >0 )) {/* Peek analogue reference of first channel. */ -if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) { +if (CR_AREF (cmd->chanlist[0 ]) ==AREF_DIFF ) max_speed_ai =MAX_SPEED_AI_DIFF ; - }else { +else max_speed_ai =MAX_SPEED_AI_SE ; - } + }else {/* No channel list. Assume single-ended. */ max_speed_ai =MAX_SPEED_AI_SE ;
@@ -1871,9 +1871,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, } }else if (cmd->scan_begin_src ==TRIG_TIMER ) {/* N.B. cmd->convert_arg is also TRIG_TIMER */ -if (!pci230_ai_check_scan_period (cmd)) { +if (!pci230_ai_check_scan_period (cmd)) err++; - } + }else {if (cmd->scan_begin_arg !=0 ) { cmd->scan_begin_arg =0 ;
@@ -1961,13 +1961,13 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, errors |= seq_err; }/* Channels must have same AREF. */ -if (aref != prev_aref) { +if (aref != prev_aref) errors |= aref_err; - } +/* Channel ranges must have same polarity. */ -if (polarity != prev_polarity) { +if (polarity != prev_polarity) errors |= polarity_err; - } +/* Single-ended channel pairs must have same * range. */ if ((aref != AREF_DIFF)
@@ -1987,9 +1987,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, }/* If channel list is a repeating subsequence, need a whole * number of repeats. */ -if ((n % subseq_len) !=0 ) { +if ((n % subseq_len) !=0 ) errors |= seq_err; - } +if ((devpriv->hwver >0 ) && (devpriv->hwver <4 )) {/* * Buggy PCI230+ or PCI260+ requires channel 0 to be
@@ -2228,9 +2228,9 @@ static void pci230_ai_start(struct comedi_device *dev, devpriv->adccon = (devpriv->adccon & ~PCI230_ADC_TRIG_MASK ) | conv;outw (devpriv->adccon, dev->iobase +PCI230_ADCCON ); -if (cmd->convert_src ==TRIG_INT ) { +if (cmd->convert_src ==TRIG_INT ) async->inttrig = pci230_ai_inttrig_convert; - } +/* Update FIFO interrupt trigger level, which is currently * set to "full". */ pci230_ai_update_fifo_trigger_level (dev, s);
@@ -2345,9 +2345,9 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } }/* Claim resources. */ -if (!get_resources (dev, res_mask,OWNER_AICMD )) { +if (!get_resources (dev, res_mask,OWNER_AICMD ))return -EBUSY ; - } +/* Get number of scans required. */ if (cmd->stop_src ==TRIG_COUNT ) {
@@ -2392,11 +2392,11 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) range =CR_RANGE (cmd->chanlist[0 ]); devpriv->ai_bipolar = pci230_ai_bipolar[range]; -if (devpriv->ai_bipolar) { +if (devpriv->ai_bipolar) adccon |=PCI230_ADC_IR_BIP ; - }else { +else adccon |=PCI230_ADC_IR_UNI ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {unsigned int gainshift;
@@ -2543,9 +2543,9 @@ static unsigned int pci230_choose_clk_count(uint64_t ns, unsigned int *count,for (clk_src =CLK_10MHZ ;; clk_src++) { cnt =divide_ns (ns, pci230_timebase[clk_src], round_mode); -if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ )) { +if ((cnt <=65536 ) || (clk_src ==CLK_1KHZ ))break ; - } + } *count = cnt;return clk_src;
@@ -2575,9 +2575,9 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct,/* Program clock source. */ outb (CLK_CONFIG (ct, clk_src), devpriv->iobase1 +PCI230_ZCLK_SCE );/* Set initial count. */ -if (count >=65536 ) { +if (count >=65536 ) count =0 ; - } +i8254_write (devpriv->iobase1 +PCI230_Z2_CT_BASE ,0 , ct, count); }
@@ -2599,9 +2599,9 @@ static irqreturn_t pci230_interrupt(int irq, void *d)/* Read interrupt status/enable register. */ status_int =inb (devpriv->iobase1 +PCI230_INT_STAT ); -if (status_int ==PCI230_INT_DISABLE ) { +if (status_int ==PCI230_INT_DISABLE )return IRQ_NONE ; - } +spin_lock_irqsave (&devpriv->isr_spinlock, irqflags); valid_status_int = devpriv->int_en & status_int;
@@ -2660,9 +2660,9 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,struct comedi_async *async = s->async;struct comedi_cmd *cmd = &async->cmd; -if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 )) { +if (!devpriv->ao_continuous && (devpriv->ao_scan_count ==0 ))return ; - } +for (i =0 ; i < cmd->chanlist_len; i++) {/* Read sample from Comedi's circular buffer. */
@@ -2711,9 +2711,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, num_scans =comedi_buf_read_n_available (async) / bytes_per_scan;if (!devpriv->ao_continuous) {/* Fixed number of scans. */ -if (num_scans > devpriv->ao_scan_count) { +if (num_scans > devpriv->ao_scan_count) num_scans = devpriv->ao_scan_count; - } +if (devpriv->ao_scan_count ==0 ) {/* End of acquisition. */ events |=COMEDI_CB_EOA ;
@@ -2736,21 +2736,21 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, }if (events ==0 ) {/* Determine how much room is in the FIFO (in samples). */ -if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) { +if ((dacstat &PCI230P2_DAC_FIFO_FULL ) !=0 ) room =PCI230P2_DAC_FIFOROOM_FULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_HALF ) !=0 ) room =PCI230P2_DAC_FIFOROOM_HALFTOFULL ; - }else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) { +else if ((dacstat &PCI230P2_DAC_FIFO_EMPTY ) !=0 ) room =PCI230P2_DAC_FIFOROOM_EMPTY ; - }else { +else room =PCI230P2_DAC_FIFOROOM_ONETOHALF ; - } +/* Convert room to number of scans that can be added. */ room /= cmd->chanlist_len;/* Determine number of scans to process. */ -if (num_scans > room) { +if (num_scans > room) num_scans = room; - } +/* Process scans. */ for (n =0 ; n < num_scans; n++) {for (i =0 ; i < cmd->chanlist_len; i++) {
@@ -2817,14 +2817,14 @@ static void pci230_handle_ai(struct comedi_device *dev, }else { todo = (devpriv->ai_scan_count * scanlen) - devpriv->ai_scan_pos; -if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) { +if (todo >PCI230_ADC_FIFOLEVEL_HALFFULL ) todo =PCI230_ADC_FIFOLEVEL_HALFFULL ; - } + } -if (todo ==0 ) { +if (todo ==0 )return ; - } + fifoamount =0 ;for (i =0 ; i < todo; i++) {
@@ -2906,9 +2906,9 @@ static void pci230_ao_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ao_stop_spinlock, irqflags); started =test_and_clear_bit (AO_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ao_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->scan_begin_src ==TRIG_TIMER ) {
@@ -2968,9 +2968,9 @@ static void pci230_ai_stop(struct comedi_device *dev,spin_lock_irqsave (&devpriv->ai_stop_spinlock, irqflags); started =test_and_clear_bit (AI_CMD_STARTED , &devpriv->state);spin_unlock_irqrestore (&devpriv->ai_stop_spinlock, irqflags); -if (!started) { +if (!started)return ; - } + cmd = &s->async->cmd;if (cmd->convert_src ==TRIG_TIMER ) {
Signature · 1 line
1.7.0.3
PATCH 3/9 Staging: comedi: adl_pci9111: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed coding style issue
--- drivers/staging/comedi/drivers/adl_pci9111.c | 30 +++++++++++++------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/adl_pci9111.c +15 -15
@@ -585,9 +585,9 @@ pci9111_ai_do_cmd_test(struct comedi_device *dev, (cmd->scan_begin_src != TRIG_EXT)) error++; -if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) { +if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) error++; - } +if ((cmd->convert_src ==TRIG_TIMER ) && !((cmd->scan_begin_src ==TRIG_TIMER ) || (cmd->scan_begin_src ==TRIG_FOLLOW ))) {
@@ -1067,9 +1067,9 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,pci9111_ai_channel_set (CR_CHAN ((&insn->chanspec)[0 ])); -if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ])) { +if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ]))pci9111_ai_range_set (CR_RANGE ((&insn->chanspec)[0 ])); - } +pci9111_fifo_reset ();
@@ -1090,11 +1090,11 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, conversion_done: -if (resolution ==PCI9111_HR_AI_RESOLUTION ) { +if (resolution ==PCI9111_HR_AI_RESOLUTION ) data[i] =pci9111_hr_ai_get_data (); - }else { +else data[i] =pci9111_ai_get_data (); - } + }#ifdef AI_INSN_DEBUG
@@ -1131,9 +1131,9 @@ static int pci9111_ao_insn_read(struct comedi_device *dev, {int i; -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = dev_private->ao_readback &PCI9111_AO_RESOLUTION_MASK ; - } +return i; }
@@ -1222,9 +1222,9 @@ static int pci9111_attach(struct comedi_device *dev,int error, i;const struct pci9111_board *board; -if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 ) { +if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 )return -ENOMEM ; - } +/* Probe the device to determine what device in the series it is. */ printk ("comedi%d: " PCI9111_DRIVER_NAME " driver\n" , dev->minor);
@@ -1394,14 +1394,14 @@ static int pci9111_detach(struct comedi_device *dev) }/* Release previously allocated irq */ -if (dev->irq !=0 ) { +if (dev->irq !=0 )free_irq (dev->irq, dev); - } +if (dev_private !=0 && dev_private->pci_device !=0 ) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (dev_private->pci_device); - } +pci_dev_put (dev_private->pci_device); }
Signature · 1 line
1.7.0
PATCH 3/9 Staging: comedi: adl_pci9111: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed coding style issue
--- drivers/staging/comedi/drivers/adl_pci9111.c | 30 +++++++++++++------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/adl_pci9111.c +15 -15
@@ -585,9 +585,9 @@ pci9111_ai_do_cmd_test(struct comedi_device *dev, (cmd->scan_begin_src != TRIG_EXT)) error++; -if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) { +if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) error++; - } +if ((cmd->convert_src ==TRIG_TIMER ) && !((cmd->scan_begin_src ==TRIG_TIMER ) || (cmd->scan_begin_src ==TRIG_FOLLOW ))) {
@@ -1067,9 +1067,9 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,pci9111_ai_channel_set (CR_CHAN ((&insn->chanspec)[0 ])); -if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ])) { +if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ]))pci9111_ai_range_set (CR_RANGE ((&insn->chanspec)[0 ])); - } +pci9111_fifo_reset ();
@@ -1090,11 +1090,11 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, conversion_done: -if (resolution ==PCI9111_HR_AI_RESOLUTION ) { +if (resolution ==PCI9111_HR_AI_RESOLUTION ) data[i] =pci9111_hr_ai_get_data (); - }else { +else data[i] =pci9111_ai_get_data (); - } + }#ifdef AI_INSN_DEBUG
@@ -1131,9 +1131,9 @@ static int pci9111_ao_insn_read(struct comedi_device *dev, {int i; -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = dev_private->ao_readback &PCI9111_AO_RESOLUTION_MASK ; - } +return i; }
@@ -1222,9 +1222,9 @@ static int pci9111_attach(struct comedi_device *dev,int error, i;const struct pci9111_board *board; -if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 ) { +if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 )return -ENOMEM ; - } +/* Probe the device to determine what device in the series it is. */ printk ("comedi%d: " PCI9111_DRIVER_NAME " driver\n" , dev->minor);
@@ -1394,14 +1394,14 @@ static int pci9111_detach(struct comedi_device *dev) }/* Release previously allocated irq */ -if (dev->irq !=0 ) { +if (dev->irq !=0 )free_irq (dev->irq, dev); - } +if (dev_private !=0 && dev_private->pci_device !=0 ) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (dev_private->pci_device); - } +pci_dev_put (dev_private->pci_device); }
Signature · 1 line
1.7.0.2
PATCH 3/9 Staging: comedi: adl_pci9111: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed coding style issue
--- drivers/staging/comedi/drivers/adl_pci9111.c | 30 +++++++++++++------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/adl_pci9111.c +15 -15
@@ -585,9 +585,9 @@ pci9111_ai_do_cmd_test(struct comedi_device *dev, (cmd->scan_begin_src != TRIG_EXT)) error++; -if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) { +if ((cmd->convert_src !=TRIG_TIMER ) && (cmd->convert_src !=TRIG_EXT )) error++; - } +if ((cmd->convert_src ==TRIG_TIMER ) && !((cmd->scan_begin_src ==TRIG_TIMER ) || (cmd->scan_begin_src ==TRIG_FOLLOW ))) {
@@ -1067,9 +1067,9 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,pci9111_ai_channel_set (CR_CHAN ((&insn->chanspec)[0 ])); -if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ])) { +if ((pci9111_ai_range_get ()) !=CR_RANGE ((&insn->chanspec)[0 ]))pci9111_ai_range_set (CR_RANGE ((&insn->chanspec)[0 ])); - } +pci9111_fifo_reset ();
@@ -1090,11 +1090,11 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, conversion_done: -if (resolution ==PCI9111_HR_AI_RESOLUTION ) { +if (resolution ==PCI9111_HR_AI_RESOLUTION ) data[i] =pci9111_hr_ai_get_data (); - }else { +else data[i] =pci9111_ai_get_data (); - } + }#ifdef AI_INSN_DEBUG
@@ -1131,9 +1131,9 @@ static int pci9111_ao_insn_read(struct comedi_device *dev, {int i; -for (i =0 ; i < insn->n; i++) { +for (i =0 ; i < insn->n; i++) data[i] = dev_private->ao_readback &PCI9111_AO_RESOLUTION_MASK ; - } +return i; }
@@ -1222,9 +1222,9 @@ static int pci9111_attach(struct comedi_device *dev,int error, i;const struct pci9111_board *board; -if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 ) { +if (alloc_private (dev,sizeof (struct pci9111_private_data )) <0 )return -ENOMEM ; - } +/* Probe the device to determine what device in the series it is. */ printk ("comedi%d: " PCI9111_DRIVER_NAME " driver\n" , dev->minor);
@@ -1394,14 +1394,14 @@ static int pci9111_detach(struct comedi_device *dev) }/* Release previously allocated irq */ -if (dev->irq !=0 ) { +if (dev->irq !=0 )free_irq (dev->irq, dev); - } +if (dev_private !=0 && dev_private->pci_device !=0 ) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (dev_private->pci_device); - } +pci_dev_put (dev_private->pci_device); }
Signature · 1 line
1.7.0.3
Re: Staging: comedi: adl_pci9111: fixed multiple brace coding style issue
drivers/staging/comedi/drivers/adl_pci9111.c
Quoted 6 lines · Jason Wong
Fixed coding style issue
Signed-off-by Jason Wong <[email protected]>drivers/staging/comedi/drivers/adl_pci9111.c +0
-0
Someone already fixed this up, sorry.
greg k-h
This is me stepping up after watching Greg HK's presentation in FOSDEM 2010.
All patches here correct brace coding style issue.
There are no dependancy between the patches, except patch 8 and patch 9, which should be apply in correct order.
[PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue [PATCH 2/9] Staging: comedi: amplc_pci230: fix brace coding style issue [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple brace coding style issue [PATCH 4/9] Staging: comedi: adl_pci9118: fixed multiple brace coding style issue [PATCH 5/9] Staging: comedi: adv_pci1710: fixed multiple brace coding style issue [PATCH 6/9] Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue [PATCH 7/9] Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue [PATCH 8/9] Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
Cheers,
-Jason
PATCH 4/9 Staging: comedi: adl_pci9118: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adl_pci9118.c | 98 +++++++++++++------------- 1 files changed, 49 insertions(+), 49 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +49 -49
@@ -393,11 +393,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,int n, chanreg, ch; ch =CR_CHAN (insn->chanspec); -if (ch) { +if (ch) chanreg =PCI9118_DA2 ; - }else { +else chanreg =PCI9118_DA1 ; - } +for (n =0 ; n < insn->n; n++) {outl (data[n], dev->iobase + chanreg);
@@ -560,11 +560,11 @@ static void pci9118_ai_munge(struct comedi_device *dev,for (i =0 ; i < num_samples; i++) {if (devpriv->usedma) array[i] =be16_to_cpu (array[i]); -if (devpriv->ai16bits) { +if (devpriv->ai16bits) array[i] ^=0x8000 ; - }else { +else array[i] = (array[i] >>4 ) &0x0fff ; - } + } }
@@ -790,20 +790,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, err++; tmp = cmd->scan_begin_src; -if (devpriv->master) { +if (devpriv->master) cmd->scan_begin_src &=TRIG_TIMER |TRIG_EXT |TRIG_FOLLOW ; - }else { +else cmd->scan_begin_src &=TRIG_FOLLOW ; - } +if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) err++; tmp = cmd->convert_src; -if (devpriv->master) { +if (devpriv->master) cmd->convert_src &=TRIG_TIMER |TRIG_EXT |TRIG_NOW ; - }else { +else cmd->convert_src &=TRIG_TIMER |TRIG_EXT ; - } +if (!cmd->convert_src || tmp != cmd->convert_src) err++;
@@ -1043,12 +1043,12 @@ static int Compute_and_setup_dma(struct comedi_device *dev)DPRINTK ("1 dmalen0=%d dmalen1=%d ai_data_len=%d\n" , dmalen0, dmalen1, devpriv->ai_data_len);/* isn't output buff smaller that our DMA buff? */ -if (dmalen0 > (devpriv->ai_data_len)) { +if (dmalen0 > (devpriv->ai_data_len)) dmalen0 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } -if (dmalen1 > (devpriv->ai_data_len)) { + +if (dmalen1 > (devpriv->ai_data_len)) dmalen1 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } +DPRINTK ("2 dmalen0=%d dmalen1=%d \n" , dmalen0, dmalen1);/* we want wake up every scan? */
@@ -1294,9 +1294,9 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,return -EIO ; }; -if (devpriv->ai12_startstop) { +if (devpriv->ai12_startstop)pci9118_exttrg_add (dev,EXTTRG_AI );/* activate EXT trigger */ - } + devpriv->int_ai_func = interrupt_pci9118_ai_dma;/* transfer function */
@@ -1369,12 +1369,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }/* use sample&hold signal? */ -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->usessh =1 ; - }/* yes */ -else { +/* yes */ +else devpriv->usessh =0 ; - }/* no */ +/* no */ DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n", devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh,
@@ -1388,12 +1388,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->usedma =1 ;if ((cmd->flags &TRIG_WAKE_EOS ) && (devpriv->ai_n_scanlen ==1 )) { -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ; - } -if (cmd->convert_src ==TRIG_TIMER ) { + +if (cmd->convert_src ==TRIG_TIMER ) devpriv->usedma =0 ;/* use INT transfer if scanlist have only one channel */ - } + } if ((cmd->flags & TRIG_WAKE_EOS) && (devpriv->ai_n_scanlen & 1) &&
@@ -1456,11 +1456,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)/* compute timers settings */ /* simplest way, fr=4Mhz/(tim1*tim2), channel manipulation without timers effect */ if (((cmd->scan_begin_src ==TRIG_FOLLOW ) || (cmd->scan_begin_src ==TRIG_EXT ) || (cmd->scan_begin_src ==TRIG_INT )) && (cmd->convert_src ==TRIG_TIMER )) {/* both timer is used for one time */ -if (cmd->scan_begin_src ==TRIG_EXT ) { +if (cmd->scan_begin_src ==TRIG_EXT ) devpriv->ai_do =4 ; - }else { +else devpriv->ai_do =1 ; - } + pci9118_calc_divisors(devpriv->ai_do, dev, s, &cmd->scan_begin_arg, &cmd->convert_arg, devpriv->ai_flags,
@@ -1597,17 +1597,17 @@ static int setup_channel_list(struct comedi_device *dev,/* All is ok, so we can setup channel/range list */ -if (!bipolar) { +if (!bipolar) devpriv->AdControlReg |= AdControl_UniP;/* set unibipolar */ - }else { +else devpriv->AdControlReg &= ((~AdControl_UniP) &0xff );/* enable bipolar */ - } -if (differencial) { + +if (differencial) devpriv->AdControlReg |= AdControl_Diff;/* enable diff inputs */ - }else { +else devpriv->AdControlReg &= ((~AdControl_Diff) &0xff );/* set single ended inputs */ - } +outl (devpriv->AdControlReg, dev->iobase +PCI9118_ADCNTRL );/* setup mode */
@@ -1673,9 +1673,9 @@ static int setup_channel_list(struct comedi_device *dev, }#ifdef PCI9118_EXTDEBUG DPRINTK ("CHL: " ); -for (i =0 ; i <= (useeos * n_chan); i++) { +for (i =0 ; i <= (useeos * n_chan); i++)DPRINTK ("%04x " , devpriv->chanlist[i]); - } +DPRINTK ("\n " );#endif #endif
@@ -1897,11 +1897,11 @@ static int pci9118_attach(struct comedi_device *dev, opt_bus = it->options[0 ]; opt_slot = it->options[1 ]; -if (it->options[3 ] &1 ) { +if (it->options[3 ] &1 ) master =0 ;/* user don't want use bus master */ - }else { +else master =1 ; - } + ret =alloc_private (dev,sizeof (struct pci9118_private ));if (ret <0 ) {
@@ -1944,9 +1944,9 @@ static int pci9118_attach(struct comedi_device *dev,return -EIO ; } -if (master) { +if (master)pci_set_master (pcidev); - } + pci_bus = pcidev->bus->number; pci_slot =PCI_SLOT (pcidev->devfn);
@@ -2025,9 +2025,9 @@ static int pci9118_attach(struct comedi_device *dev,if (devpriv->usemux >256 ) devpriv->usemux =256 ;/* max 256 channels! */ if (it->options[4 ] >0 ) -if (devpriv->usemux >128 ) { +if (devpriv->usemux >128 ) devpriv->usemux =128 ;/* max 128 channels with softare S&H! */ - } +printk (", ext. mux %d channels" , devpriv->usemux); }
@@ -2054,11 +2054,11 @@ static int pci9118_attach(struct comedi_device *dev, dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND |SDF_DIFF ; -if (devpriv->usemux) { +if (devpriv->usemux) s->n_chan = devpriv->usemux; - }else { +else s->n_chan = this_board->n_aichan; - } + s->maxdata = this_board->ai_maxdata; s->len_chanlist = this_board->n_aichanlist; s->range_table = this_board->rangelist_ai;
@@ -2129,9 +2129,9 @@ static int pci9118_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); }if (devpriv->dmabuf_virt[0 ])
Signature · 1 line
1.7.0
PATCH 4/9 Staging: comedi: adl_pci9118: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adl_pci9118.c | 98 +++++++++++++------------- 1 files changed, 49 insertions(+), 49 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +49 -49
@@ -393,11 +393,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,int n, chanreg, ch; ch =CR_CHAN (insn->chanspec); -if (ch) { +if (ch) chanreg =PCI9118_DA2 ; - }else { +else chanreg =PCI9118_DA1 ; - } +for (n =0 ; n < insn->n; n++) {outl (data[n], dev->iobase + chanreg);
@@ -560,11 +560,11 @@ static void pci9118_ai_munge(struct comedi_device *dev,for (i =0 ; i < num_samples; i++) {if (devpriv->usedma) array[i] =be16_to_cpu (array[i]); -if (devpriv->ai16bits) { +if (devpriv->ai16bits) array[i] ^=0x8000 ; - }else { +else array[i] = (array[i] >>4 ) &0x0fff ; - } + } }
@@ -790,20 +790,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, err++; tmp = cmd->scan_begin_src; -if (devpriv->master) { +if (devpriv->master) cmd->scan_begin_src &=TRIG_TIMER |TRIG_EXT |TRIG_FOLLOW ; - }else { +else cmd->scan_begin_src &=TRIG_FOLLOW ; - } +if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) err++; tmp = cmd->convert_src; -if (devpriv->master) { +if (devpriv->master) cmd->convert_src &=TRIG_TIMER |TRIG_EXT |TRIG_NOW ; - }else { +else cmd->convert_src &=TRIG_TIMER |TRIG_EXT ; - } +if (!cmd->convert_src || tmp != cmd->convert_src) err++;
@@ -1043,12 +1043,12 @@ static int Compute_and_setup_dma(struct comedi_device *dev)DPRINTK ("1 dmalen0=%d dmalen1=%d ai_data_len=%d\n" , dmalen0, dmalen1, devpriv->ai_data_len);/* isn't output buff smaller that our DMA buff? */ -if (dmalen0 > (devpriv->ai_data_len)) { +if (dmalen0 > (devpriv->ai_data_len)) dmalen0 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } -if (dmalen1 > (devpriv->ai_data_len)) { + +if (dmalen1 > (devpriv->ai_data_len)) dmalen1 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } +DPRINTK ("2 dmalen0=%d dmalen1=%d \n" , dmalen0, dmalen1);/* we want wake up every scan? */
@@ -1294,9 +1294,9 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,return -EIO ; }; -if (devpriv->ai12_startstop) { +if (devpriv->ai12_startstop)pci9118_exttrg_add (dev,EXTTRG_AI );/* activate EXT trigger */ - } + devpriv->int_ai_func = interrupt_pci9118_ai_dma;/* transfer function */
@@ -1369,12 +1369,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }/* use sample&hold signal? */ -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->usessh =1 ; - }/* yes */ -else { +/* yes */ +else devpriv->usessh =0 ; - }/* no */ +/* no */ DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n", devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh,
@@ -1388,12 +1388,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->usedma =1 ;if ((cmd->flags &TRIG_WAKE_EOS ) && (devpriv->ai_n_scanlen ==1 )) { -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ; - } -if (cmd->convert_src ==TRIG_TIMER ) { + +if (cmd->convert_src ==TRIG_TIMER ) devpriv->usedma =0 ;/* use INT transfer if scanlist have only one channel */ - } + } if ((cmd->flags & TRIG_WAKE_EOS) && (devpriv->ai_n_scanlen & 1) &&
@@ -1456,11 +1456,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)/* compute timers settings */ /* simplest way, fr=4Mhz/(tim1*tim2), channel manipulation without timers effect */ if (((cmd->scan_begin_src ==TRIG_FOLLOW ) || (cmd->scan_begin_src ==TRIG_EXT ) || (cmd->scan_begin_src ==TRIG_INT )) && (cmd->convert_src ==TRIG_TIMER )) {/* both timer is used for one time */ -if (cmd->scan_begin_src ==TRIG_EXT ) { +if (cmd->scan_begin_src ==TRIG_EXT ) devpriv->ai_do =4 ; - }else { +else devpriv->ai_do =1 ; - } + pci9118_calc_divisors(devpriv->ai_do, dev, s, &cmd->scan_begin_arg, &cmd->convert_arg, devpriv->ai_flags,
@@ -1597,17 +1597,17 @@ static int setup_channel_list(struct comedi_device *dev,/* All is ok, so we can setup channel/range list */ -if (!bipolar) { +if (!bipolar) devpriv->AdControlReg |= AdControl_UniP;/* set unibipolar */ - }else { +else devpriv->AdControlReg &= ((~AdControl_UniP) &0xff );/* enable bipolar */ - } -if (differencial) { + +if (differencial) devpriv->AdControlReg |= AdControl_Diff;/* enable diff inputs */ - }else { +else devpriv->AdControlReg &= ((~AdControl_Diff) &0xff );/* set single ended inputs */ - } +outl (devpriv->AdControlReg, dev->iobase +PCI9118_ADCNTRL );/* setup mode */
@@ -1673,9 +1673,9 @@ static int setup_channel_list(struct comedi_device *dev, }#ifdef PCI9118_EXTDEBUG DPRINTK ("CHL: " ); -for (i =0 ; i <= (useeos * n_chan); i++) { +for (i =0 ; i <= (useeos * n_chan); i++)DPRINTK ("%04x " , devpriv->chanlist[i]); - } +DPRINTK ("\n " );#endif #endif
@@ -1897,11 +1897,11 @@ static int pci9118_attach(struct comedi_device *dev, opt_bus = it->options[0 ]; opt_slot = it->options[1 ]; -if (it->options[3 ] &1 ) { +if (it->options[3 ] &1 ) master =0 ;/* user don't want use bus master */ - }else { +else master =1 ; - } + ret =alloc_private (dev,sizeof (struct pci9118_private ));if (ret <0 ) {
@@ -1944,9 +1944,9 @@ static int pci9118_attach(struct comedi_device *dev,return -EIO ; } -if (master) { +if (master)pci_set_master (pcidev); - } + pci_bus = pcidev->bus->number; pci_slot =PCI_SLOT (pcidev->devfn);
@@ -2025,9 +2025,9 @@ static int pci9118_attach(struct comedi_device *dev,if (devpriv->usemux >256 ) devpriv->usemux =256 ;/* max 256 channels! */ if (it->options[4 ] >0 ) -if (devpriv->usemux >128 ) { +if (devpriv->usemux >128 ) devpriv->usemux =128 ;/* max 128 channels with softare S&H! */ - } +printk (", ext. mux %d channels" , devpriv->usemux); }
@@ -2054,11 +2054,11 @@ static int pci9118_attach(struct comedi_device *dev, dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND |SDF_DIFF ; -if (devpriv->usemux) { +if (devpriv->usemux) s->n_chan = devpriv->usemux; - }else { +else s->n_chan = this_board->n_aichan; - } + s->maxdata = this_board->ai_maxdata; s->len_chanlist = this_board->n_aichanlist; s->range_table = this_board->rangelist_ai;
@@ -2129,9 +2129,9 @@ static int pci9118_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); }if (devpriv->dmabuf_virt[0 ])
Signature · 1 line
1.7.0.2
PATCH 4/9 Staging: comedi: adl_pci9118: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adl_pci9118.c | 98 +++++++++++++------------- 1 files changed, 49 insertions(+), 49 deletions(-)
drivers/staging/comedi/drivers/adl_pci9118.c +49 -49
@@ -393,11 +393,11 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,int n, chanreg, ch; ch =CR_CHAN (insn->chanspec); -if (ch) { +if (ch) chanreg =PCI9118_DA2 ; - }else { +else chanreg =PCI9118_DA1 ; - } +for (n =0 ; n < insn->n; n++) {outl (data[n], dev->iobase + chanreg);
@@ -560,11 +560,11 @@ static void pci9118_ai_munge(struct comedi_device *dev,for (i =0 ; i < num_samples; i++) {if (devpriv->usedma) array[i] =be16_to_cpu (array[i]); -if (devpriv->ai16bits) { +if (devpriv->ai16bits) array[i] ^=0x8000 ; - }else { +else array[i] = (array[i] >>4 ) &0x0fff ; - } + } }
@@ -790,20 +790,20 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, err++; tmp = cmd->scan_begin_src; -if (devpriv->master) { +if (devpriv->master) cmd->scan_begin_src &=TRIG_TIMER |TRIG_EXT |TRIG_FOLLOW ; - }else { +else cmd->scan_begin_src &=TRIG_FOLLOW ; - } +if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) err++; tmp = cmd->convert_src; -if (devpriv->master) { +if (devpriv->master) cmd->convert_src &=TRIG_TIMER |TRIG_EXT |TRIG_NOW ; - }else { +else cmd->convert_src &=TRIG_TIMER |TRIG_EXT ; - } +if (!cmd->convert_src || tmp != cmd->convert_src) err++;
@@ -1043,12 +1043,12 @@ static int Compute_and_setup_dma(struct comedi_device *dev)DPRINTK ("1 dmalen0=%d dmalen1=%d ai_data_len=%d\n" , dmalen0, dmalen1, devpriv->ai_data_len);/* isn't output buff smaller that our DMA buff? */ -if (dmalen0 > (devpriv->ai_data_len)) { +if (dmalen0 > (devpriv->ai_data_len)) dmalen0 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } -if (dmalen1 > (devpriv->ai_data_len)) { + +if (dmalen1 > (devpriv->ai_data_len)) dmalen1 = devpriv->ai_data_len & ~3L ;/* allign to 32bit down */ - } +DPRINTK ("2 dmalen0=%d dmalen1=%d \n" , dmalen0, dmalen1);/* we want wake up every scan? */
@@ -1294,9 +1294,9 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,return -EIO ; }; -if (devpriv->ai12_startstop) { +if (devpriv->ai12_startstop)pci9118_exttrg_add (dev,EXTTRG_AI );/* activate EXT trigger */ - } + devpriv->int_ai_func = interrupt_pci9118_ai_dma;/* transfer function */
@@ -1369,12 +1369,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) }/* use sample&hold signal? */ -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->usessh =1 ; - }/* yes */ -else { +/* yes */ +else devpriv->usessh =0 ; - }/* no */ +/* no */ DPRINTK("1 neverending=%d scans=%u usessh=%d ai_startstop=0x%2x\n", devpriv->ai_neverending, devpriv->ai_scans, devpriv->usessh,
@@ -1388,12 +1388,12 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->usedma =1 ;if ((cmd->flags &TRIG_WAKE_EOS ) && (devpriv->ai_n_scanlen ==1 )) { -if (cmd->convert_src ==TRIG_NOW ) { +if (cmd->convert_src ==TRIG_NOW ) devpriv->ai_add_back =1 ; - } -if (cmd->convert_src ==TRIG_TIMER ) { + +if (cmd->convert_src ==TRIG_TIMER ) devpriv->usedma =0 ;/* use INT transfer if scanlist have only one channel */ - } + } if ((cmd->flags & TRIG_WAKE_EOS) && (devpriv->ai_n_scanlen & 1) &&
@@ -1456,11 +1456,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)/* compute timers settings */ /* simplest way, fr=4Mhz/(tim1*tim2), channel manipulation without timers effect */ if (((cmd->scan_begin_src ==TRIG_FOLLOW ) || (cmd->scan_begin_src ==TRIG_EXT ) || (cmd->scan_begin_src ==TRIG_INT )) && (cmd->convert_src ==TRIG_TIMER )) {/* both timer is used for one time */ -if (cmd->scan_begin_src ==TRIG_EXT ) { +if (cmd->scan_begin_src ==TRIG_EXT ) devpriv->ai_do =4 ; - }else { +else devpriv->ai_do =1 ; - } + pci9118_calc_divisors(devpriv->ai_do, dev, s, &cmd->scan_begin_arg, &cmd->convert_arg, devpriv->ai_flags,
@@ -1597,17 +1597,17 @@ static int setup_channel_list(struct comedi_device *dev,/* All is ok, so we can setup channel/range list */ -if (!bipolar) { +if (!bipolar) devpriv->AdControlReg |= AdControl_UniP;/* set unibipolar */ - }else { +else devpriv->AdControlReg &= ((~AdControl_UniP) &0xff );/* enable bipolar */ - } -if (differencial) { + +if (differencial) devpriv->AdControlReg |= AdControl_Diff;/* enable diff inputs */ - }else { +else devpriv->AdControlReg &= ((~AdControl_Diff) &0xff );/* set single ended inputs */ - } +outl (devpriv->AdControlReg, dev->iobase +PCI9118_ADCNTRL );/* setup mode */
@@ -1673,9 +1673,9 @@ static int setup_channel_list(struct comedi_device *dev, }#ifdef PCI9118_EXTDEBUG DPRINTK ("CHL: " ); -for (i =0 ; i <= (useeos * n_chan); i++) { +for (i =0 ; i <= (useeos * n_chan); i++)DPRINTK ("%04x " , devpriv->chanlist[i]); - } +DPRINTK ("\n " );#endif #endif
@@ -1897,11 +1897,11 @@ static int pci9118_attach(struct comedi_device *dev, opt_bus = it->options[0 ]; opt_slot = it->options[1 ]; -if (it->options[3 ] &1 ) { +if (it->options[3 ] &1 ) master =0 ;/* user don't want use bus master */ - }else { +else master =1 ; - } + ret =alloc_private (dev,sizeof (struct pci9118_private ));if (ret <0 ) {
@@ -1944,9 +1944,9 @@ static int pci9118_attach(struct comedi_device *dev,return -EIO ; } -if (master) { +if (master)pci_set_master (pcidev); - } + pci_bus = pcidev->bus->number; pci_slot =PCI_SLOT (pcidev->devfn);
@@ -2025,9 +2025,9 @@ static int pci9118_attach(struct comedi_device *dev,if (devpriv->usemux >256 ) devpriv->usemux =256 ;/* max 256 channels! */ if (it->options[4 ] >0 ) -if (devpriv->usemux >128 ) { +if (devpriv->usemux >128 ) devpriv->usemux =128 ;/* max 128 channels with softare S&H! */ - } +printk (", ext. mux %d channels" , devpriv->usemux); }
@@ -2054,11 +2054,11 @@ static int pci9118_attach(struct comedi_device *dev, dev->read_subdev = s; s->type =COMEDI_SUBD_AI ; s->subdev_flags =SDF_READABLE |SDF_COMMON |SDF_GROUND |SDF_DIFF ; -if (devpriv->usemux) { +if (devpriv->usemux) s->n_chan = devpriv->usemux; - }else { +else s->n_chan = this_board->n_aichan; - } + s->maxdata = this_board->ai_maxdata; s->len_chanlist = this_board->n_aichanlist; s->range_table = this_board->rangelist_ai;
@@ -2129,9 +2129,9 @@ static int pci9118_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); }if (devpriv->dmabuf_virt[0 ])
Signature · 1 line
1.7.0.3
PATCH 5/9 Staging: comedi: adv_pci1710: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci1710.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/comedi/drivers/adv_pci1710.c +11 -11
@@ -657,9 +657,9 @@ static void interrupt_pci1710_every_sample(void *d)#endif ++s->async->cur_chan; -if (s->async->cur_chan >= devpriv->ai_n_chan) { +if (s->async->cur_chan >= devpriv->ai_n_chan) s->async->cur_chan =0 ; - } +if (s->async->cur_chan ==0 ) {/* one scan done */ devpriv->ai_act_scan++;
@@ -863,12 +863,12 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, devpriv->ai_eos =0 ; } -if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) { +if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) devpriv->neverending_ai =1 ; - }/* well, user want neverending */ -else { +/* well, user want neverending */ +else devpriv->neverending_ai =0 ; - } +switch (mode) {case 1 :case 2 :
@@ -1109,11 +1109,11 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ai_timer1 =0 ; devpriv->ai_timer2 =0 ; -if (cmd->stop_src ==TRIG_COUNT ) { +if (cmd->stop_src ==TRIG_COUNT ) devpriv->ai_scans = cmd->stop_arg; - }else { +else devpriv->ai_scans =0 ; - } +if (cmd->scan_begin_src ==TRIG_FOLLOW ) {/* mode 1, 2, 3 */ if (cmd->convert_src ==TRIG_TIMER ) {/* mode 1 and 2 */
@@ -1593,9 +1593,9 @@ static int pci1710_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } }
Signature · 1 line
1.7.0
PATCH 5/9 Staging: comedi: adv_pci1710: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci1710.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/comedi/drivers/adv_pci1710.c +11 -11
@@ -657,9 +657,9 @@ static void interrupt_pci1710_every_sample(void *d)#endif ++s->async->cur_chan; -if (s->async->cur_chan >= devpriv->ai_n_chan) { +if (s->async->cur_chan >= devpriv->ai_n_chan) s->async->cur_chan =0 ; - } +if (s->async->cur_chan ==0 ) {/* one scan done */ devpriv->ai_act_scan++;
@@ -863,12 +863,12 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, devpriv->ai_eos =0 ; } -if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) { +if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) devpriv->neverending_ai =1 ; - }/* well, user want neverending */ -else { +/* well, user want neverending */ +else devpriv->neverending_ai =0 ; - } +switch (mode) {case 1 :case 2 :
@@ -1109,11 +1109,11 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ai_timer1 =0 ; devpriv->ai_timer2 =0 ; -if (cmd->stop_src ==TRIG_COUNT ) { +if (cmd->stop_src ==TRIG_COUNT ) devpriv->ai_scans = cmd->stop_arg; - }else { +else devpriv->ai_scans =0 ; - } +if (cmd->scan_begin_src ==TRIG_FOLLOW ) {/* mode 1, 2, 3 */ if (cmd->convert_src ==TRIG_TIMER ) {/* mode 1 and 2 */
@@ -1593,9 +1593,9 @@ static int pci1710_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } }
Signature · 1 line
1.7.0.2
PATCH 5/9 Staging: comedi: adv_pci1710: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci1710.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/comedi/drivers/adv_pci1710.c +11 -11
@@ -657,9 +657,9 @@ static void interrupt_pci1710_every_sample(void *d)#endif ++s->async->cur_chan; -if (s->async->cur_chan >= devpriv->ai_n_chan) { +if (s->async->cur_chan >= devpriv->ai_n_chan) s->async->cur_chan =0 ; - } +if (s->async->cur_chan ==0 ) {/* one scan done */ devpriv->ai_act_scan++;
@@ -863,12 +863,12 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, devpriv->ai_eos =0 ; } -if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) { +if ((devpriv->ai_scans ==0 ) || (devpriv->ai_scans ==-1 )) devpriv->neverending_ai =1 ; - }/* well, user want neverending */ -else { +/* well, user want neverending */ +else devpriv->neverending_ai =0 ; - } +switch (mode) {case 1 :case 2 :
@@ -1109,11 +1109,11 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ai_timer1 =0 ; devpriv->ai_timer2 =0 ; -if (cmd->stop_src ==TRIG_COUNT ) { +if (cmd->stop_src ==TRIG_COUNT ) devpriv->ai_scans = cmd->stop_arg; - }else { +else devpriv->ai_scans =0 ; - } +if (cmd->scan_begin_src ==TRIG_FOLLOW ) {/* mode 1, 2, 3 */ if (cmd->convert_src ==TRIG_TIMER ) {/* mode 1 and 2 */
@@ -1593,9 +1593,9 @@ static int pci1710_detach(struct comedi_device *dev)if (dev->irq)free_irq (dev->irq, dev);if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } }
Signature · 1 line
1.7.0.3
PATCH 6/9 Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci_dio.c | 34 +++++++++++++------------- 1 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/comedi/drivers/adv_pci_dio.c +17 -17
@@ -367,9 +367,9 @@ static int pci_dio_insn_bits_di_b(struct comedi_device *dev,int i; data[1 ] =0 ; -for (i =0 ; i < d->regs; i++) { +for (i =0 ; i < d->regs; i++) data[1 ] |=inb (dev->iobase + d->addr + i) << (8 * i); - } +return 2 ; }
@@ -882,9 +882,9 @@ static int CheckAndAllocCard(struct comedi_device *dev,struct pci_dio_private *pr, *prev;for (pr = pci_priv, prev =NULL ; pr !=NULL ; prev = pr, pr = pr->next) { -if (pr->pcidev == pcidev) { +if (pr->pcidev == pcidev)return 0 ;/* this card is used, look for another */ - } + }if (prev) {
@@ -1040,22 +1040,22 @@ static int pci_dio_detach(struct comedi_device *dev)int subdev;if (dev->private) { -if (devpriv->valid) { +if (devpriv->valid)pci_dio_reset (dev); - } +/* This shows the silliness of using this kind of * scheme for numbering subdevices. Don't do it. --ds */ subdev =0 ;for (i =0 ; i <MAX_DI_SUBDEVS ; i++) { -if (this_board->sdi[i].chans) { +if (this_board->sdi[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DO_SUBDEVS ; i++) { -if (this_board->sdo[i].chans) { +if (this_board->sdo[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DIO_SUBDEVG ; i++) {for (j =0 ; j < this_board->sdio[i].regs; j++) {
@@ -1071,20 +1071,20 @@ static int pci_dio_detach(struct comedi_device *dev) }if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } -if (devpriv->prev) { +if (devpriv->prev) devpriv->prev->next = devpriv->next; - }else { +else pci_priv = devpriv->next; - } -if (devpriv->next) { + +if (devpriv->next) devpriv->next->prev = devpriv->prev; - } + }return 0 ;
Signature · 1 line
1.7.0
PATCH 6/9 Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci_dio.c | 34 +++++++++++++------------- 1 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/comedi/drivers/adv_pci_dio.c +17 -17
@@ -367,9 +367,9 @@ static int pci_dio_insn_bits_di_b(struct comedi_device *dev,int i; data[1 ] =0 ; -for (i =0 ; i < d->regs; i++) { +for (i =0 ; i < d->regs; i++) data[1 ] |=inb (dev->iobase + d->addr + i) << (8 * i); - } +return 2 ; }
@@ -882,9 +882,9 @@ static int CheckAndAllocCard(struct comedi_device *dev,struct pci_dio_private *pr, *prev;for (pr = pci_priv, prev =NULL ; pr !=NULL ; prev = pr, pr = pr->next) { -if (pr->pcidev == pcidev) { +if (pr->pcidev == pcidev)return 0 ;/* this card is used, look for another */ - } + }if (prev) {
@@ -1040,22 +1040,22 @@ static int pci_dio_detach(struct comedi_device *dev)int subdev;if (dev->private) { -if (devpriv->valid) { +if (devpriv->valid)pci_dio_reset (dev); - } +/* This shows the silliness of using this kind of * scheme for numbering subdevices. Don't do it. --ds */ subdev =0 ;for (i =0 ; i <MAX_DI_SUBDEVS ; i++) { -if (this_board->sdi[i].chans) { +if (this_board->sdi[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DO_SUBDEVS ; i++) { -if (this_board->sdo[i].chans) { +if (this_board->sdo[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DIO_SUBDEVG ; i++) {for (j =0 ; j < this_board->sdio[i].regs; j++) {
@@ -1071,20 +1071,20 @@ static int pci_dio_detach(struct comedi_device *dev) }if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } -if (devpriv->prev) { +if (devpriv->prev) devpriv->prev->next = devpriv->next; - }else { +else pci_priv = devpriv->next; - } -if (devpriv->next) { + +if (devpriv->next) devpriv->next->prev = devpriv->prev; - } + }return 0 ;
Signature · 1 line
1.7.0.2
PATCH 6/9 Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/adv_pci_dio.c | 34 +++++++++++++------------- 1 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/comedi/drivers/adv_pci_dio.c +17 -17
@@ -367,9 +367,9 @@ static int pci_dio_insn_bits_di_b(struct comedi_device *dev,int i; data[1 ] =0 ; -for (i =0 ; i < d->regs; i++) { +for (i =0 ; i < d->regs; i++) data[1 ] |=inb (dev->iobase + d->addr + i) << (8 * i); - } +return 2 ; }
@@ -882,9 +882,9 @@ static int CheckAndAllocCard(struct comedi_device *dev,struct pci_dio_private *pr, *prev;for (pr = pci_priv, prev =NULL ; pr !=NULL ; prev = pr, pr = pr->next) { -if (pr->pcidev == pcidev) { +if (pr->pcidev == pcidev)return 0 ;/* this card is used, look for another */ - } + }if (prev) {
@@ -1040,22 +1040,22 @@ static int pci_dio_detach(struct comedi_device *dev)int subdev;if (dev->private) { -if (devpriv->valid) { +if (devpriv->valid)pci_dio_reset (dev); - } +/* This shows the silliness of using this kind of * scheme for numbering subdevices. Don't do it. --ds */ subdev =0 ;for (i =0 ; i <MAX_DI_SUBDEVS ; i++) { -if (this_board->sdi[i].chans) { +if (this_board->sdi[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DO_SUBDEVS ; i++) { -if (this_board->sdo[i].chans) { +if (this_board->sdo[i].chans) subdev++; - } + }for (i =0 ; i <MAX_DIO_SUBDEVG ; i++) {for (j =0 ; j < this_board->sdio[i].regs; j++) {
@@ -1071,20 +1071,20 @@ static int pci_dio_detach(struct comedi_device *dev) }if (devpriv->pcidev) { -if (dev->iobase) { +if (dev->iobase)comedi_pci_disable (devpriv->pcidev); - } +pci_dev_put (devpriv->pcidev); } -if (devpriv->prev) { +if (devpriv->prev) devpriv->prev->next = devpriv->next; - }else { +else pci_priv = devpriv->next; - } -if (devpriv->next) { + +if (devpriv->next) devpriv->next->prev = devpriv->prev; - } + }return 0 ;
Signature · 1 line
1.7.0.3
Staging: comedi frivers patches
In reply to a message not in the archiveThis is me stepping up after watching a video on Greg KH's presentation on kernel patching in FOSDEM 2010.
All patches here correct brace coding style issue.
There are no dependency between the patches, except patch 8 and patch 9, which should be apply in correct order.
[PATCH 1/9] Staging: comedi: amplc_pci224: fixed multiple brace coding style issue [PATCH 2/9] Staging: comedi: amplc_pci230: fix brace coding style issue [PATCH 3/9] Staging: comedi: adl_pci9111: fixed multiple brace coding style issue [PATCH 4/9] Staging: comedi: adl_pci9118: fixed multiple brace coding style issue [PATCH 5/9] Staging: comedi: adv_pci1710: fixed multiple brace coding style issue [PATCH 6/9] Staging: comedi: adv_pci_dio: fixed multiple brace coding style issue [PATCH 7/9] Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue [PATCH 8/9] Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue [PATCH 9/9] Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
Cheers
-Jason
PATCH 7/9 Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue
--- drivers/staging/comedi/drivers/cb_das16_cs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/comedi/drivers/cb_das16_cs.c +6 -6
@@ -174,16 +174,16 @@ static int das16cs_attach(struct comedi_device *dev,printk ("I/O base=0x%04lx " , dev->iobase);printk ("fingerprint:\n" ); -for (i =0 ; i <48 ; i +=2 ) { +for (i =0 ; i <48 ; i +=2 )printk ("%04x " ,inw (dev->iobase + i)); - } +printk ("\n" ); ret =request_irq (link->irq.AssignedIRQ, das16cs_interrupt,IRQF_SHARED ,"cb_das16_cs" , dev); -if (ret <0 ) { +if (ret <0 )return ret; - } + dev->irq = link->irq.AssignedIRQ;printk ("irq=%u " , dev->irq);
@@ -261,9 +261,9 @@ static int das16cs_detach(struct comedi_device *dev) {printk ("comedi%d: das16cs: remove\n" , dev->minor); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +return 0 ; }
Signature · 1 line
1.7.0
PATCH 7/9 Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue
--- drivers/staging/comedi/drivers/cb_das16_cs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/comedi/drivers/cb_das16_cs.c +6 -6
@@ -174,16 +174,16 @@ static int das16cs_attach(struct comedi_device *dev,printk ("I/O base=0x%04lx " , dev->iobase);printk ("fingerprint:\n" ); -for (i =0 ; i <48 ; i +=2 ) { +for (i =0 ; i <48 ; i +=2 )printk ("%04x " ,inw (dev->iobase + i)); - } +printk ("\n" ); ret =request_irq (link->irq.AssignedIRQ, das16cs_interrupt,IRQF_SHARED ,"cb_das16_cs" , dev); -if (ret <0 ) { +if (ret <0 )return ret; - } + dev->irq = link->irq.AssignedIRQ;printk ("irq=%u " , dev->irq);
@@ -261,9 +261,9 @@ static int das16cs_detach(struct comedi_device *dev) {printk ("comedi%d: das16cs: remove\n" , dev->minor); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +return 0 ; }
Signature · 1 line
1.7.0.2
PATCH 7/9 Staging: comedi: cb_das16_cs: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue
--- drivers/staging/comedi/drivers/cb_das16_cs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/comedi/drivers/cb_das16_cs.c +6 -6
@@ -174,16 +174,16 @@ static int das16cs_attach(struct comedi_device *dev,printk ("I/O base=0x%04lx " , dev->iobase);printk ("fingerprint:\n" ); -for (i =0 ; i <48 ; i +=2 ) { +for (i =0 ; i <48 ; i +=2 )printk ("%04x " ,inw (dev->iobase + i)); - } +printk ("\n" ); ret =request_irq (link->irq.AssignedIRQ, das16cs_interrupt,IRQF_SHARED ,"cb_das16_cs" , dev); -if (ret <0 ) { +if (ret <0 )return ret; - } + dev->irq = link->irq.AssignedIRQ;printk ("irq=%u " , dev->irq);
@@ -261,9 +261,9 @@ static int das16cs_detach(struct comedi_device *dev) {printk ("comedi%d: das16cs: remove\n" , dev->minor); -if (dev->irq) { +if (dev->irq)free_irq (dev->irq, dev); - } +return 0 ; }
Signature · 1 line
1.7.0.3
PATCH 8/9 Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 40 +++++++++++++------------- 1 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +20 -20
@@ -1621,9 +1621,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)priv (dev)->ai_buffer[i] =pci_alloc_consistent (priv (dev)->hw_dev,DMA_BUFFER_SIZE , &priv (dev)->ai_buffer_bus_addr[i]); -if (priv (dev)->ai_buffer[i] ==NULL ) { +if (priv (dev)->ai_buffer[i] ==NULL )return -ENOMEM ; - } + }for (i =0 ; i <AO_DMA_RING_COUNT ; i++) {if (ao_cmd_is_supported (board (dev))) {
@@ -1632,9 +1632,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)DMA_BUFFER_SIZE , &priv (dev)-> ao_buffer_bus_addr[i]); -if (priv (dev)->ao_buffer[i] ==NULL ) { +if (priv (dev)->ao_buffer[i] ==NULL )return -ENOMEM ; - } + } }/* allocate dma descriptors */
@@ -1643,9 +1643,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *ai_dma_ring_count (board (dev)), &priv(dev)->ai_dma_desc_bus_addr); -if (priv (dev)->ai_dma_desc ==NULL ) { +if (priv (dev)->ai_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ai dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ai_dma_desc_bus_addr);if (ao_cmd_is_supported (board (dev))) {
@@ -1654,9 +1654,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *AO_DMA_RING_COUNT , &priv(dev)->ao_dma_desc_bus_addr); -if (priv (dev)->ao_dma_desc ==NULL ) { +if (priv (dev)->ao_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ao dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ao_dma_desc_bus_addr); }
@@ -1848,9 +1848,9 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (" irq %u\n" , dev->irq); retval =setup_subdevices (dev); -if (retval <0 ) { +if (retval <0 )return retval; - } +return 0 ; }
@@ -1919,9 +1919,9 @@ static int detach(struct comedi_device *dev)priv (dev)->ao_dma_desc,priv (dev)-> ao_dma_desc_bus_addr); -if (priv (dev)->main_phys_iobase) { +if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - } +pci_dev_put (priv (dev)->hw_dev); } }
@@ -2902,9 +2902,9 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)if (cmd->stop_src ==TRIG_COUNT ) {if (priv (dev)->ai_count ==0 )break ; -if (num_samples >priv (dev)->ai_count) { +if (num_samples >priv (dev)->ai_count) num_samples =priv (dev)->ai_count; - } +priv (dev)->ai_count -= num_samples; }
@@ -2943,9 +2943,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)readw (priv (dev)->main_iobase +ADC_READ_PNTR_REG ) &0x7fff ;if (cmd->stop_src ==TRIG_COUNT ) { -if (max_transfer >priv (dev)->ai_count) { +if (max_transfer >priv (dev)->ai_count) max_transfer =priv (dev)->ai_count; - } + }for (i =0 ; read_code != write_code && i < max_transfer;) { fifo_data =readl (priv (dev)->dio_counter_iobase +ADC_FIFO_REG );
@@ -2964,9 +2964,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)/* empty fifo */ static void pio_drain_ai_fifo (struct comedi_device *dev) { -if (board (dev)->layout ==LAYOUT_4020 ) { +if (board (dev)->layout ==LAYOUT_4020 )pio_drain_ai_fifo_32 (dev); - }else +else pio_drain_ai_fifo_16 (dev); }
@@ -3038,9 +3038,9 @@ void handle_ai_interrupt(struct comedi_device *dev, unsigned short status, priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);DEBUG_PRINT ("dma1 status 0x%x\n" , dma1_status); -if (dma1_status &PLX_DMA_EN_BIT ) { +if (dma1_status &PLX_DMA_EN_BIT )drain_dma_buffers (dev,1 ); - } +DEBUG_PRINT (" cleared dma ch1 interrupt\n" ); }spin_unlock_irqrestore (&dev->spinlock, flags);
Signature · 1 line
1.7.0
PATCH 8/9 Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 40 +++++++++++++------------- 1 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +20 -20
@@ -1621,9 +1621,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)priv (dev)->ai_buffer[i] =pci_alloc_consistent (priv (dev)->hw_dev,DMA_BUFFER_SIZE , &priv (dev)->ai_buffer_bus_addr[i]); -if (priv (dev)->ai_buffer[i] ==NULL ) { +if (priv (dev)->ai_buffer[i] ==NULL )return -ENOMEM ; - } + }for (i =0 ; i <AO_DMA_RING_COUNT ; i++) {if (ao_cmd_is_supported (board (dev))) {
@@ -1632,9 +1632,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)DMA_BUFFER_SIZE , &priv (dev)-> ao_buffer_bus_addr[i]); -if (priv (dev)->ao_buffer[i] ==NULL ) { +if (priv (dev)->ao_buffer[i] ==NULL )return -ENOMEM ; - } + } }/* allocate dma descriptors */
@@ -1643,9 +1643,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *ai_dma_ring_count (board (dev)), &priv(dev)->ai_dma_desc_bus_addr); -if (priv (dev)->ai_dma_desc ==NULL ) { +if (priv (dev)->ai_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ai dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ai_dma_desc_bus_addr);if (ao_cmd_is_supported (board (dev))) {
@@ -1654,9 +1654,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *AO_DMA_RING_COUNT , &priv(dev)->ao_dma_desc_bus_addr); -if (priv (dev)->ao_dma_desc ==NULL ) { +if (priv (dev)->ao_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ao dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ao_dma_desc_bus_addr); }
@@ -1848,9 +1848,9 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (" irq %u\n" , dev->irq); retval =setup_subdevices (dev); -if (retval <0 ) { +if (retval <0 )return retval; - } +return 0 ; }
@@ -1919,9 +1919,9 @@ static int detach(struct comedi_device *dev)priv (dev)->ao_dma_desc,priv (dev)-> ao_dma_desc_bus_addr); -if (priv (dev)->main_phys_iobase) { +if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - } +pci_dev_put (priv (dev)->hw_dev); } }
@@ -2902,9 +2902,9 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)if (cmd->stop_src ==TRIG_COUNT ) {if (priv (dev)->ai_count ==0 )break ; -if (num_samples >priv (dev)->ai_count) { +if (num_samples >priv (dev)->ai_count) num_samples =priv (dev)->ai_count; - } +priv (dev)->ai_count -= num_samples; }
@@ -2943,9 +2943,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)readw (priv (dev)->main_iobase +ADC_READ_PNTR_REG ) &0x7fff ;if (cmd->stop_src ==TRIG_COUNT ) { -if (max_transfer >priv (dev)->ai_count) { +if (max_transfer >priv (dev)->ai_count) max_transfer =priv (dev)->ai_count; - } + }for (i =0 ; read_code != write_code && i < max_transfer;) { fifo_data =readl (priv (dev)->dio_counter_iobase +ADC_FIFO_REG );
@@ -2964,9 +2964,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)/* empty fifo */ static void pio_drain_ai_fifo (struct comedi_device *dev) { -if (board (dev)->layout ==LAYOUT_4020 ) { +if (board (dev)->layout ==LAYOUT_4020 )pio_drain_ai_fifo_32 (dev); - }else +else pio_drain_ai_fifo_16 (dev); }
@@ -3038,9 +3038,9 @@ void handle_ai_interrupt(struct comedi_device *dev, unsigned short status, priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);DEBUG_PRINT ("dma1 status 0x%x\n" , dma1_status); -if (dma1_status &PLX_DMA_EN_BIT ) { +if (dma1_status &PLX_DMA_EN_BIT )drain_dma_buffers (dev,1 ); - } +DEBUG_PRINT (" cleared dma ch1 interrupt\n" ); }spin_unlock_irqrestore (&dev->spinlock, flags);
Signature · 1 line
1.7.0.2
PATCH 8/9 Staging: comedi: cb_pcidas64: fixed multiple brace coding style issue
In reply to a message not in the archiveFixed multiple coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 40 +++++++++++++------------- 1 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +20 -20
@@ -1621,9 +1621,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)priv (dev)->ai_buffer[i] =pci_alloc_consistent (priv (dev)->hw_dev,DMA_BUFFER_SIZE , &priv (dev)->ai_buffer_bus_addr[i]); -if (priv (dev)->ai_buffer[i] ==NULL ) { +if (priv (dev)->ai_buffer[i] ==NULL )return -ENOMEM ; - } + }for (i =0 ; i <AO_DMA_RING_COUNT ; i++) {if (ao_cmd_is_supported (board (dev))) {
@@ -1632,9 +1632,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)DMA_BUFFER_SIZE , &priv (dev)-> ao_buffer_bus_addr[i]); -if (priv (dev)->ao_buffer[i] ==NULL ) { +if (priv (dev)->ao_buffer[i] ==NULL )return -ENOMEM ; - } + } }/* allocate dma descriptors */
@@ -1643,9 +1643,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *ai_dma_ring_count (board (dev)), &priv(dev)->ai_dma_desc_bus_addr); -if (priv (dev)->ai_dma_desc ==NULL ) { +if (priv (dev)->ai_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ai dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ai_dma_desc_bus_addr);if (ao_cmd_is_supported (board (dev))) {
@@ -1654,9 +1654,9 @@ int alloc_and_init_dma_members(struct comedi_device *dev)sizeof (struct plx_dma_desc ) *AO_DMA_RING_COUNT , &priv(dev)->ao_dma_desc_bus_addr); -if (priv (dev)->ao_dma_desc ==NULL ) { +if (priv (dev)->ao_dma_desc ==NULL )return -ENOMEM ; - } +DEBUG_PRINT ("ao dma descriptors start at bus addr 0x%x\n" ,priv (dev)->ao_dma_desc_bus_addr); }
@@ -1848,9 +1848,9 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)printk (" irq %u\n" , dev->irq); retval =setup_subdevices (dev); -if (retval <0 ) { +if (retval <0 )return retval; - } +return 0 ; }
@@ -1919,9 +1919,9 @@ static int detach(struct comedi_device *dev)priv (dev)->ao_dma_desc,priv (dev)-> ao_dma_desc_bus_addr); -if (priv (dev)->main_phys_iobase) { +if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - } +pci_dev_put (priv (dev)->hw_dev); } }
@@ -2902,9 +2902,9 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)if (cmd->stop_src ==TRIG_COUNT ) {if (priv (dev)->ai_count ==0 )break ; -if (num_samples >priv (dev)->ai_count) { +if (num_samples >priv (dev)->ai_count) num_samples =priv (dev)->ai_count; - } +priv (dev)->ai_count -= num_samples; }
@@ -2943,9 +2943,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)readw (priv (dev)->main_iobase +ADC_READ_PNTR_REG ) &0x7fff ;if (cmd->stop_src ==TRIG_COUNT ) { -if (max_transfer >priv (dev)->ai_count) { +if (max_transfer >priv (dev)->ai_count) max_transfer =priv (dev)->ai_count; - } + }for (i =0 ; read_code != write_code && i < max_transfer;) { fifo_data =readl (priv (dev)->dio_counter_iobase +ADC_FIFO_REG );
@@ -2964,9 +2964,9 @@ static void pio_drain_ai_fifo_32(struct comedi_device *dev)/* empty fifo */ static void pio_drain_ai_fifo (struct comedi_device *dev) { -if (board (dev)->layout ==LAYOUT_4020 ) { +if (board (dev)->layout ==LAYOUT_4020 )pio_drain_ai_fifo_32 (dev); - }else +else pio_drain_ai_fifo_16 (dev); }
@@ -3038,9 +3038,9 @@ void handle_ai_interrupt(struct comedi_device *dev, unsigned short status, priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);DEBUG_PRINT ("dma1 status 0x%x\n" , dma1_status); -if (dma1_status &PLX_DMA_EN_BIT ) { +if (dma1_status &PLX_DMA_EN_BIT )drain_dma_buffers (dev,1 ); - } +DEBUG_PRINT (" cleared dma ch1 interrupt\n" ); }spin_unlock_irqrestore (&dev->spinlock, flags);
Signature · 1 line
1.7.0.3
PATCH 9/9 Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
In reply to a message not in the archiveFixed a coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +1 -1
@@ -1921,7 +1921,7 @@ static int detach(struct comedi_device *dev) ao_dma_desc_bus_addr);if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - +pci_dev_put (priv (dev)->hw_dev); } }
Signature · 1 line
1.7.0
PATCH 9/9 Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
In reply to a message not in the archiveFixed a coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +1 -1
@@ -1921,7 +1921,7 @@ static int detach(struct comedi_device *dev) ao_dma_desc_bus_addr);if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - +pci_dev_put (priv (dev)->hw_dev); } }
Signature · 1 line
1.7.0.2
PATCH 9/9 Staging: comedi: cb_pcidas64: fixed a coding style missed in the previosu patch
In reply to a message not in the archiveFixed a coding style issue.
--- drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/comedi/drivers/cb_pcidas64.c +1 -1
@@ -1921,7 +1921,7 @@ static int detach(struct comedi_device *dev) ao_dma_desc_bus_addr);if (priv (dev)->main_phys_iobase)comedi_pci_disable (priv (dev)->hw_dev); - +pci_dev_put (priv (dev)->hw_dev); } }
Signature · 1 line
1.7.0.3