hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: me4000: rename local variables used for 'dev->private' 

In comedi drivers the local variable used for the dev->private pointer is
normally named 'devpriv'. For aesthetics, rename the variables in this
driver. Also, rename the struct to follow the norm.

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-08-05 10:44:49 -07:00 committed by Greg Kroah-Hartman
parent e5f6635022
commit 3674a87ebe
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/comedi/drivers/me4000.c
View File

@ -166,7 +166,7 @@ broken.
#define ME4000_AI_CHANNEL_LIST_COUNT 1024 #define ME4000_AI_CHANNEL_LIST_COUNT 1024
struct me4000_info { struct me4000_private {
unsigned long plx_regbase; unsigned long plx_regbase;
}; };
@ -316,7 +316,7 @@ static int me4000_xilinx_download(struct comedi_device *dev,
unsigned long context) unsigned long context)
{ {
struct pci_dev *pcidev = comedi_to_pci_dev(dev); struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct me4000_info *info = dev->private; struct me4000_private *devpriv = dev->private;
unsigned long xilinx_iobase = pci_resource_start(pcidev, 5); unsigned long xilinx_iobase = pci_resource_start(pcidev, 5);
unsigned int file_length; unsigned int file_length;
unsigned int val; unsigned int val;
@ -329,28 +329,28 @@ static int me4000_xilinx_download(struct comedi_device *dev,
* Set PLX local interrupt 2 polarity to high. * Set PLX local interrupt 2 polarity to high.
* Interrupt is thrown by init pin of xilinx. * Interrupt is thrown by init pin of xilinx.
*/ */
outl(PLX9052_INTCSR_LI2POL, info->plx_regbase + PLX9052_INTCSR); outl(PLX9052_INTCSR_LI2POL, devpriv->plx_regbase + PLX9052_INTCSR);
/* Set /CS and /WRITE of the Xilinx */ /* Set /CS and /WRITE of the Xilinx */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
val |= PLX9052_CNTRL_UIO2_DATA; val |= PLX9052_CNTRL_UIO2_DATA;
outl(val, info->plx_regbase + PLX9052_CNTRL); outl(val, devpriv->plx_regbase + PLX9052_CNTRL);
/* Init Xilinx with CS1 */ /* Init Xilinx with CS1 */
inb(xilinx_iobase + 0xC8); inb(xilinx_iobase + 0xC8);
/* Wait until /INIT pin is set */ /* Wait until /INIT pin is set */
udelay(20); udelay(20);
val = inl(info->plx_regbase + PLX9052_INTCSR); val = inl(devpriv->plx_regbase + PLX9052_INTCSR);
if (!(val & PLX9052_INTCSR_LI2STAT)) { if (!(val & PLX9052_INTCSR_LI2STAT)) {
dev_err(dev->class_dev, "Can't init Xilinx\n"); dev_err(dev->class_dev, "Can't init Xilinx\n");
return -EIO; return -EIO;
} }
/* Reset /CS and /WRITE of the Xilinx */ /* Reset /CS and /WRITE of the Xilinx */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
val &= ~PLX9052_CNTRL_UIO2_DATA; val &= ~PLX9052_CNTRL_UIO2_DATA;
outl(val, info->plx_regbase + PLX9052_CNTRL); outl(val, devpriv->plx_regbase + PLX9052_CNTRL);
/* Download Xilinx firmware */ /* Download Xilinx firmware */
file_length = (((unsigned int)data[0] & 0xff) << 24) + file_length = (((unsigned int)data[0] & 0xff) << 24) +
@ -364,7 +364,7 @@ static int me4000_xilinx_download(struct comedi_device *dev,
udelay(10); udelay(10);
/* Check if BUSY flag is low */ /* Check if BUSY flag is low */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
if (val & PLX9052_CNTRL_UIO1_DATA) { if (val & PLX9052_CNTRL_UIO1_DATA) {
dev_err(dev->class_dev, dev_err(dev->class_dev,
"Xilinx is still busy (i = %d)\n", i); "Xilinx is still busy (i = %d)\n", i);
@ -373,7 +373,7 @@ static int me4000_xilinx_download(struct comedi_device *dev,
} }
/* If done flag is high download was successful */ /* If done flag is high download was successful */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
if (!(val & PLX9052_CNTRL_UIO0_DATA)) { if (!(val & PLX9052_CNTRL_UIO0_DATA)) {
dev_err(dev->class_dev, "DONE flag is not set\n"); dev_err(dev->class_dev, "DONE flag is not set\n");
dev_err(dev->class_dev, "Download not successful\n"); dev_err(dev->class_dev, "Download not successful\n");
@ -381,25 +381,25 @@ static int me4000_xilinx_download(struct comedi_device *dev,
} }
/* Set /CS and /WRITE */ /* Set /CS and /WRITE */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
val |= PLX9052_CNTRL_UIO2_DATA; val |= PLX9052_CNTRL_UIO2_DATA;
outl(val, info->plx_regbase + PLX9052_CNTRL); outl(val, devpriv->plx_regbase + PLX9052_CNTRL);
return 0; return 0;
} }
static void me4000_reset(struct comedi_device *dev) static void me4000_reset(struct comedi_device *dev)
{ {
struct me4000_info *info = dev->private; struct me4000_private *devpriv = dev->private;
unsigned int val; unsigned int val;
int chan; int chan;
/* Make a hardware reset */ /* Make a hardware reset */
val = inl(info->plx_regbase + PLX9052_CNTRL); val = inl(devpriv->plx_regbase + PLX9052_CNTRL);
val |= PLX9052_CNTRL_PCI_RESET; val |= PLX9052_CNTRL_PCI_RESET;
outl(val, info->plx_regbase + PLX9052_CNTRL); outl(val, devpriv->plx_regbase + PLX9052_CNTRL);
val &= ~PLX9052_CNTRL_PCI_RESET; val &= ~PLX9052_CNTRL_PCI_RESET;
outl(val, info->plx_regbase + PLX9052_CNTRL); outl(val, devpriv->plx_regbase + PLX9052_CNTRL);
/* 0x8000 to the DACs means an output voltage of 0V */ /* 0x8000 to the DACs means an output voltage of 0V */
for (chan = 0; chan < 4; chan++) for (chan = 0; chan < 4; chan++)
@ -417,7 +417,7 @@ static void me4000_reset(struct comedi_device *dev)
/* Enable interrupts on the PLX */ /* Enable interrupts on the PLX */
outl(PLX9052_INTCSR_LI1ENAB | outl(PLX9052_INTCSR_LI1ENAB |
PLX9052_INTCSR_LI1POL | PLX9052_INTCSR_LI1POL |
PLX9052_INTCSR_PCIENAB, info->plx_regbase + PLX9052_INTCSR); PLX9052_INTCSR_PCIENAB, devpriv->plx_regbase + PLX9052_INTCSR);
/* Set the adustment register for AO demux */ /* Set the adustment register for AO demux */
outl(ME4000_AO_DEMUX_ADJUST_VALUE, outl(ME4000_AO_DEMUX_ADJUST_VALUE,
@ -1244,7 +1244,7 @@ static int me4000_auto_attach(struct comedi_device *dev,
{ {
struct pci_dev *pcidev = comedi_to_pci_dev(dev); struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct me4000_board *board = NULL; const struct me4000_board *board = NULL;
struct me4000_info *info; struct me4000_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int result; int result;
@ -1255,17 +1255,17 @@ static int me4000_auto_attach(struct comedi_device *dev,
dev->board_ptr = board; dev->board_ptr = board;
dev->board_name = board->name; dev->board_name = board->name;
info = comedi_alloc_devpriv(dev, sizeof(*info)); devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!info) if (!devpriv)
return -ENOMEM; return -ENOMEM;
result = comedi_pci_enable(dev); result = comedi_pci_enable(dev);
if (result) if (result)
return result; return result;
info->plx_regbase = pci_resource_start(pcidev, 1); devpriv->plx_regbase = pci_resource_start(pcidev, 1);
dev->iobase = pci_resource_start(pcidev, 2); dev->iobase = pci_resource_start(pcidev, 2);
if (!info->plx_regbase || !dev->iobase) if (!devpriv->plx_regbase || !dev->iobase)
return -ENODEV; return -ENODEV;
result = comedi_load_firmware(dev, &pcidev->dev, ME4000_FIRMWARE, result = comedi_load_firmware(dev, &pcidev->dev, ME4000_FIRMWARE,