diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-13 17:47:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-16 23:20:10 -0700 |
| commit | b4008c7207e832d14414f76774a8ebc7067f2154 (patch) | |
| tree | 0fd7e94db0cdfe5682d9cfd1d29d1140c9ce8670 /drivers | |
| parent | 8499ad694a20de85a9e37da4a1aa57869f368fb2 (diff) | |
| download | op-kernel-dev-b4008c7207e832d14414f76774a8ebc7067f2154.zip op-kernel-dev-b4008c7207e832d14414f76774a8ebc7067f2154.tar.gz | |
staging: comedi: cb_pcidas: rename private data 's5933_intcsr_bits'
For aesthetics, rename this member of the private data.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 5305d60..58f20d5 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -303,7 +303,7 @@ struct cb_pcidas_private { unsigned long pcibar4; /* bits to write to registers */ unsigned int ctrl; - unsigned int s5933_intcsr_bits; + unsigned int amcc_intcsr; unsigned int ao_ctrl; /* fifo buffers */ unsigned short ai_buffer[AI_BUFFER_SIZE]; @@ -1168,7 +1168,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d) /* make sure mailbox 4 is empty */ inl_p(devpriv->amcc + AMCC_OP_REG_IMB4); /* clear interrupt on amcc s5933 */ - outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS, + outl(devpriv->amcc_intcsr | INTCSR_INBOX_INTR_STATUS, devpriv->amcc + AMCC_OP_REG_INTCSR); status = inw(devpriv->pcibar1 + PCIDAS_CTRL_REG); @@ -1433,11 +1433,10 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, /* make sure mailbox 4 is empty */ inl(devpriv->amcc + AMCC_OP_REG_IMB4); /* Set bits to enable incoming mailbox interrupts on amcc s5933. */ - devpriv->s5933_intcsr_bits = - INTCSR_INBOX_BYTE(3) | INTCSR_INBOX_SELECT(3) | - INTCSR_INBOX_FULL_INT; + devpriv->amcc_intcsr = INTCSR_INBOX_BYTE(3) | INTCSR_INBOX_SELECT(3) | + INTCSR_INBOX_FULL_INT; /* clear and enable interrupt on amcc s5933 */ - outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS, + outl(devpriv->amcc_intcsr | INTCSR_INBOX_INTR_STATUS, devpriv->amcc + AMCC_OP_REG_INTCSR); return 0; |
