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

staging: comedi: pcmmio: rename 'spinlock' in the private data

Browse source 
This spinlock_t is meant to protect the page registers in the asic.
Rename it to make this clear.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-12-09 15:30:58 -07:00 • committed by Greg Kroah-Hartman
parent 20218e6a3c
commit 83d55bd03f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/pcmmio.c
View file

@ -254,7 +254,7 @@ struct pcmmio_subdev_private {
* feel free to suggest moving the variable to the struct comedi_device struct. * feel free to suggest moving the variable to the struct comedi_device struct.
*/ */
struct pcmmio_private { struct pcmmio_private {
spinlock_t spinlock; spinlock_t pagelock; /* protects the page registers */
struct pcmmio_subdev_private *sprivs; struct pcmmio_subdev_private *sprivs;
unsigned int ao_readback[8]; unsigned int ao_readback[8];
@ -412,7 +412,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
/* it is an interrupt for ASIC #asic */ /* it is an interrupt for ASIC #asic */
unsigned char int_pend; unsigned char int_pend;
spin_lock_irqsave(&devpriv->spinlock, flags); spin_lock_irqsave(&devpriv->pagelock, flags);
int_pend = inb(dev->iobase + PCMMIO_INT_PENDING_REG); int_pend = inb(dev->iobase + PCMMIO_INT_PENDING_REG);
int_pend &= 0x07; int_pend &= 0x07;
@ -446,7 +446,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
++got1; ++got1;
} }
spin_unlock_irqrestore(&devpriv->spinlock, flags); spin_unlock_irqrestore(&devpriv->pagelock, flags);
if (triggered) { if (triggered) {
struct comedi_subdevice *s; struct comedi_subdevice *s;
@ -941,7 +941,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devpriv) if (!devpriv)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&devpriv->spinlock); spin_lock_init(&devpriv->pagelock);
chans_left = CHANS_PER_ASIC * 1; chans_left = CHANS_PER_ASIC * 1;
n_dio_subdevs = CALC_N_DIO_SUBDEVS(chans_left); n_dio_subdevs = CALC_N_DIO_SUBDEVS(chans_left);