leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: comedi: adl_pci6208: code styling fix

Browse Source 
Fix a checkpatch.pl errors.

Signed-off-by: Vlatko Kosturjak <kost@linux.hr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Vlatko Kosturjak 2009-09-21 21:32:40 +02:00 committed by Greg Kroah-Hartman
parent d43d27abf7
commit becdaa83c4
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/staging/comedi/drivers/adl_pci6208.c
View File

@ -133,9 +133,11 @@ static int pci6208_ao_winsn(struct comedi_device *dev,
static int pci6208_ao_rinsn(struct comedi_device *dev, static int pci6208_ao_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
/* static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, */ /* static int pci6208_dio_insn_bits (struct comedi_device *dev,
* struct comedi_subdevice *s, */
/* struct comedi_insn *insn,unsigned int *data); */ /* struct comedi_insn *insn,unsigned int *data); */
/* static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, */ /* static int pci6208_dio_insn_config(struct comedi_device *dev,
* struct comedi_subdevice *s, */
/* struct comedi_insn *insn,unsigned int *data); */ /* struct comedi_insn *insn,unsigned int *data); */
/* /*
@ -151,7 +153,7 @@ static int pci6208_attach(struct comedi_device *dev,
int retval; int retval;
unsigned long io_base; unsigned long io_base;
printk("comedi%d: pci6208: ", dev->minor); printk(KERN_INFO "comedi%d: pci6208: ", dev->minor);
retval = alloc_private(dev, sizeof(struct pci6208_private)); retval = alloc_private(dev, sizeof(struct pci6208_private));
if (retval < 0) if (retval < 0)
@ -195,7 +197,7 @@ static int pci6208_attach(struct comedi_device *dev,
/* s->insn_bits = pci6208_dio_insn_bits; */ /* s->insn_bits = pci6208_dio_insn_bits; */
/* s->insn_config = pci6208_dio_insn_config; */ /* s->insn_config = pci6208_dio_insn_config; */
printk("attached\n"); printk(KERN_INFO "attached\n");
return 1; return 1;
} }
@ -210,12 +212,11 @@ static int pci6208_attach(struct comedi_device *dev,
*/ */
static int pci6208_detach(struct comedi_device *dev) static int pci6208_detach(struct comedi_device *dev)
{ {
printk("comedi%d: pci6208: remove\n", dev->minor); printk(KERN_INFO "comedi%d: pci6208: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) { if (devpriv && devpriv->pci_dev) {
if (dev->iobase) { if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev); pci_dev_put(devpriv->pci_dev);
} }
@ -266,7 +267,8 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
* useful to applications if you implement the insn_bits interface. * useful to applications if you implement the insn_bits interface.
* This allows packed reading/writing of the DIO channels. The * This allows packed reading/writing of the DIO channels. The
* comedi core can convert between insn_bits and insn_read/write */ * comedi core can convert between insn_bits and insn_read/write */
/* static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, */ /* static int pci6208_dio_insn_bits(struct comedi_device *dev,
* struct comedi_subdevice *s, */
/* struct comedi_insn *insn,unsigned int *data) */ /* struct comedi_insn *insn,unsigned int *data) */
/* { */ /* { */
/* if(insn->n!=2)return -EINVAL; */ /* if(insn->n!=2)return -EINVAL; */
@ -290,7 +292,8 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
/* return 2; */ /* return 2; */
/* } */ /* } */
/* static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, */ /* static int pci6208_dio_insn_config(struct comedi_device *dev,
* struct comedi_subdevice *s, */
/* struct comedi_insn *insn,unsigned int *data) */ /* struct comedi_insn *insn,unsigned int *data) */
/* { */ /* { */
/* int chan=CR_CHAN(insn->chanspec); */ /* int chan=CR_CHAN(insn->chanspec); */
@ -320,10 +323,16 @@ static int pci6208_find_device(struct comedi_device *dev, int bus, int slot)
pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) { pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {
if (pci_dev->vendor == PCI_VENDOR_ID_ADLINK) { if (pci_dev->vendor == PCI_VENDOR_ID_ADLINK) {
for (i = 0; i < ARRAY_SIZE(pci6208_boards); i++) { for (i = 0; i < ARRAY_SIZE(pci6208_boards); i++) {
if (pci6208_boards[i].dev_id == pci_dev->device) { if (pci6208_boards[i].dev_id ==
/* was a particular bus/slot requested? */ pci_dev->device) {
/*
* was a particular bus/slot requested?
*/
if ((bus != 0) || (slot != 0)) { if ((bus != 0) || (slot != 0)) {
/* are we on the wrong bus/slot? */ /*
* are we on the
* wrong bus/slot?
*/
if (pci_dev->bus->number if (pci_dev->bus->number
!= bus || != bus ||
PCI_SLOT(pci_dev->devfn) PCI_SLOT(pci_dev->devfn)
@ -338,8 +347,9 @@ static int pci6208_find_device(struct comedi_device *dev, int bus, int slot)
} }
} }
printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n", printk(KERN_ERR "comedi%d: no supported board found! "
dev->minor, bus, slot); "(req. bus/slot : %d/%d)\n",
dev->minor, bus, slot);
return -EIO; return -EIO;
found: found:
@ -368,17 +378,20 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
/* Enable PCI device and request regions */ /* Enable PCI device and request regions */
if (comedi_pci_enable(pci_dev, PCI6208_DRIVER_NAME) < 0) { if (comedi_pci_enable(pci_dev, PCI6208_DRIVER_NAME) < 0) {
printk printk(KERN_ERR "comedi%d: Failed to enable PCI device "
("comedi%d: Failed to enable PCI device and request regions\n", "and request regions\n",
dev_minor); dev_minor);
return -EIO; return -EIO;
} }
/* Read local configuration register base address [PCI_BASE_ADDRESS #1]. */ /* Read local configuration register
* base address [PCI_BASE_ADDRESS #1].
*/
lcr_io_base = pci_resource_start(pci_dev, 1); lcr_io_base = pci_resource_start(pci_dev, 1);
lcr_io_range = pci_resource_len(pci_dev, 1); lcr_io_range = pci_resource_len(pci_dev, 1);
printk("comedi%d: local config registers at address 0x%4lx [0x%4lx]\n", printk(KERN_INFO "comedi%d: local config registers at address"
dev_minor, lcr_io_base, lcr_io_range); " 0x%4lx [0x%4lx]\n",
dev_minor, lcr_io_base, lcr_io_range);
/* Read PCI6208 register base address [PCI_BASE_ADDRESS #2]. */ /* Read PCI6208 register base address [PCI_BASE_ADDRESS #2]. */
io_base = pci_resource_start(pci_dev, 2); io_base = pci_resource_start(pci_dev, 2);