openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: cb_pcidas: rename private data 's5933_config' 

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>
This commit is contained in:
H Hartley Sweeten 2015-10-13 17:47:58 -07:00 committed by Greg Kroah-Hartman
parent 16ded01b69
commit 8499ad694a
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/cb_pcidas.c
View File

@ -297,7 +297,7 @@ static const struct cb_pcidas_board cb_pcidas_boards[] = {
struct cb_pcidas_private { struct cb_pcidas_private {
struct comedi_8254 *ao_pacer; struct comedi_8254 *ao_pacer;
/* base addresses */ /* base addresses */
unsigned long s5933_config; unsigned long amcc; /* pcibar0 */
unsigned long pcibar1; unsigned long pcibar1;
unsigned long pcibar2; unsigned long pcibar2;
unsigned long pcibar4; unsigned long pcibar4;
@ -474,7 +474,7 @@ static int cb_pcidas_eeprom_ready(struct comedi_device *dev,
struct cb_pcidas_private *devpriv = dev->private; struct cb_pcidas_private *devpriv = dev->private;
unsigned int status; unsigned int status;
status = inb(devpriv->s5933_config + AMCC_OP_REG_MCSR_NVCMD); status = inb(devpriv->amcc + AMCC_OP_REG_MCSR_NVCMD);
if ((status & MCSR_NV_BUSY) == 0) if ((status & MCSR_NV_BUSY) == 0)
return 0; return 0;
return -EBUSY; return -EBUSY;
@ -498,22 +498,21 @@ static int cb_pcidas_eeprom_insn_read(struct comedi_device *dev,
/* set address (chan) and read operation */ /* set address (chan) and read operation */
outb(MCSR_NV_ENABLE | MCSR_NV_LOAD_LOW_ADDR, outb(MCSR_NV_ENABLE | MCSR_NV_LOAD_LOW_ADDR,
devpriv->s5933_config + AMCC_OP_REG_MCSR_NVCMD); devpriv->amcc + AMCC_OP_REG_MCSR_NVCMD);
outb(chan & 0xff, outb(chan & 0xff, devpriv->amcc + AMCC_OP_REG_MCSR_NVDATA);
devpriv->s5933_config + AMCC_OP_REG_MCSR_NVDATA);
outb(MCSR_NV_ENABLE | MCSR_NV_LOAD_HIGH_ADDR, outb(MCSR_NV_ENABLE | MCSR_NV_LOAD_HIGH_ADDR,
devpriv->s5933_config + AMCC_OP_REG_MCSR_NVCMD); devpriv->amcc + AMCC_OP_REG_MCSR_NVCMD);
outb((chan >> 8) & 0xff, outb((chan >> 8) & 0xff,
devpriv->s5933_config + AMCC_OP_REG_MCSR_NVDATA); devpriv->amcc + AMCC_OP_REG_MCSR_NVDATA);
outb(MCSR_NV_ENABLE | MCSR_NV_READ, outb(MCSR_NV_ENABLE | MCSR_NV_READ,
devpriv->s5933_config + AMCC_OP_REG_MCSR_NVCMD); devpriv->amcc + AMCC_OP_REG_MCSR_NVCMD);
/* wait for data to be returned */ /* wait for data to be returned */
ret = comedi_timeout(dev, s, insn, cb_pcidas_eeprom_ready, 0); ret = comedi_timeout(dev, s, insn, cb_pcidas_eeprom_ready, 0);
if (ret) if (ret)
return ret; return ret;
data[i] = inb(devpriv->s5933_config + AMCC_OP_REG_MCSR_NVDATA); data[i] = inb(devpriv->amcc + AMCC_OP_REG_MCSR_NVDATA);
} }
return insn->n; return insn->n;
@ -1161,16 +1160,16 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
async = s->async; async = s->async;
cmd = &async->cmd; cmd = &async->cmd;
s5933_status = inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR); s5933_status = inl(devpriv->amcc + AMCC_OP_REG_INTCSR);
if ((INTCSR_INTR_ASSERTED & s5933_status) == 0) if ((INTCSR_INTR_ASSERTED & s5933_status) == 0)
return IRQ_NONE; return IRQ_NONE;
/* make sure mailbox 4 is empty */ /* make sure mailbox 4 is empty */
inl_p(devpriv->s5933_config + AMCC_OP_REG_IMB4); inl_p(devpriv->amcc + AMCC_OP_REG_IMB4);
/* clear interrupt on amcc s5933 */ /* clear interrupt on amcc s5933 */
outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS, outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR); devpriv->amcc + AMCC_OP_REG_INTCSR);
status = inw(devpriv->pcibar1 + PCIDAS_CTRL_REG); status = inw(devpriv->pcibar1 + PCIDAS_CTRL_REG);
@ -1268,7 +1267,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
devpriv->s5933_config = pci_resource_start(pcidev, 0); devpriv->amcc = pci_resource_start(pcidev, 0);
devpriv->pcibar1 = pci_resource_start(pcidev, 1); devpriv->pcibar1 = pci_resource_start(pcidev, 1);
devpriv->pcibar2 = pci_resource_start(pcidev, 2); devpriv->pcibar2 = pci_resource_start(pcidev, 2);
dev->iobase = pci_resource_start(pcidev, 3); dev->iobase = pci_resource_start(pcidev, 3);
@ -1277,7 +1276,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
/* disable and clear interrupts on amcc s5933 */ /* disable and clear interrupts on amcc s5933 */
outl(INTCSR_INBOX_INTR_STATUS, outl(INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR); devpriv->amcc + AMCC_OP_REG_INTCSR);
ret = request_irq(pcidev->irq, cb_pcidas_interrupt, IRQF_SHARED, ret = request_irq(pcidev->irq, cb_pcidas_interrupt, IRQF_SHARED,
dev->board_name, dev); dev->board_name, dev);
@ -1432,14 +1431,14 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev,
} }
/* make sure mailbox 4 is empty */ /* make sure mailbox 4 is empty */
inl(devpriv->s5933_config + AMCC_OP_REG_IMB4); inl(devpriv->amcc + AMCC_OP_REG_IMB4);
/* Set bits to enable incoming mailbox interrupts on amcc s5933. */ /* Set bits to enable incoming mailbox interrupts on amcc s5933. */
devpriv->s5933_intcsr_bits = devpriv->s5933_intcsr_bits =
INTCSR_INBOX_BYTE(3) | INTCSR_INBOX_SELECT(3) | INTCSR_INBOX_BYTE(3) | INTCSR_INBOX_SELECT(3) |
INTCSR_INBOX_FULL_INT; INTCSR_INBOX_FULL_INT;
/* clear and enable interrupt on amcc s5933 */ /* clear and enable interrupt on amcc s5933 */
outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS, outl(devpriv->s5933_intcsr_bits | INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR); devpriv->amcc + AMCC_OP_REG_INTCSR);
return 0; return 0;
} }
@ -1449,9 +1448,9 @@ static void cb_pcidas_detach(struct comedi_device *dev)
struct cb_pcidas_private *devpriv = dev->private; struct cb_pcidas_private *devpriv = dev->private;
if (devpriv) { if (devpriv) {
if (devpriv->s5933_config) if (devpriv->amcc)
outl(INTCSR_INBOX_INTR_STATUS, outl(INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR); devpriv->amcc + AMCC_OP_REG_INTCSR);
kfree(devpriv->ao_pacer); kfree(devpriv->ao_pacer);
} }
comedi_pci_detach(dev); comedi_pci_detach(dev);