evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: amplc_pci230: tidy up stuct pci230_private

Browse source 
Align the member comments a bit better in the declaration of `struct
pci230_private`.  Also remove the heading comment as it is just a
boilerplate comedi comment.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-07-29 12:58:26 +01:00 • committed by Greg Kroah-Hartman
parent 5565353c36
commit ab35426810
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/staging/comedi/drivers/amplc_pci230.c
View file

@ -508,40 +508,29 @@ static const struct pci230_board pci230_boards[] = {
}, },
}; };
/*
* This structure is for data unique to this hardware driver. If
* several hardware drivers keep similar information in this structure,
* feel free to suggest moving the variable to the struct comedi_device struct.
*/
struct pci230_private { struct pci230_private {
spinlock_t isr_spinlock; /* Interrupt spin lock */ spinlock_t isr_spinlock; /* Interrupt spin lock */
spinlock_t res_spinlock; /* Shared resources spin lock */ spinlock_t res_spinlock; /* Shared resources spin lock */
spinlock_t ai_stop_spinlock; /* Spin lock for stopping AI command */ spinlock_t ai_stop_spinlock; /* Spin lock for stopping AI command */
spinlock_t ao_stop_spinlock; /* Spin lock for stopping AO command */ spinlock_t ao_stop_spinlock; /* Spin lock for stopping AO command */
unsigned long state; /* State flags */ unsigned long state; /* State flags */
unsigned long iobase1; /* PCI230's I/O space 1 */ unsigned long iobase1; /* PCI230's I/O space 1 */
unsigned int ao_readback[2]; /* Used for AO readback */ unsigned int ao_readback[2]; /* Used for AO readback */
/* Number of analogue input scans remaining. */ unsigned int ai_scan_count; /* Number of AI scans remaining */
unsigned int ai_scan_count; unsigned int ai_scan_pos; /* Current position within AI scan */
/* Current position within analogue input scan */ unsigned int ao_scan_count; /* Number of AO scans remaining. */
unsigned int ai_scan_pos; int intr_cpuid; /* ID of CPU running ISR */
/* Number of analogue output scans remaining. */ unsigned short hwver; /* Hardware version (for '+' models) */
unsigned int ao_scan_count; unsigned short adccon; /* ADCCON register value */
int intr_cpuid; /* ID of CPU running interrupt routine. */ unsigned short daccon; /* DACCON register value */
unsigned short hwver; /* Hardware version (for '+' models). */ unsigned short adcfifothresh; /* ADC FIFO threshold (PCI230+/260+) */
unsigned short adccon; /* ADCCON register value. */ unsigned short adcg; /* ADCG register value */
unsigned short daccon; /* DACCON register value. */ unsigned char int_en; /* Interrupt enable bits */
/* ADC FIFO programmable interrupt level threshold (PCI230+/260+). */ unsigned char ai_bipolar; /* Flag AI range is bipolar */
unsigned short adcfifothresh; unsigned char ao_bipolar; /* Flag AO range is bipolar */
unsigned short adcg; /* ADCG register value. */ unsigned char ier; /* Copy of interrupt enable register */
unsigned char int_en; /* Interrupt enables bits. */ unsigned char intr_running; /* Flag set in interrupt routine */
/* Set if bipolar input range so we know to mangle it. */ unsigned char res_owner[NUM_RESOURCES]; /* Shared resource owners */
unsigned char ai_bipolar;
/* Set if bipolar output range so we know to mangle it. */
unsigned char ao_bipolar;
unsigned char ier; /* Copy of interrupt enables/status register. */
unsigned char intr_running; /* Flag set in interrupt routine. */
unsigned char res_owner[NUM_RESOURCES]; /* Shared resource owners. */
}; };
/* PCI230 clock source periods in ns */ /* PCI230 clock source periods in ns */