asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: addi_apci_1516: rename has_timer

Browse source 
The "timer" on these boards is actually a watchdog. Rename the
boardinfo value "has_timer" to "has_wdog".

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-13 13:48:03 -07:00 committed by Greg Kroah-Hartman
parent 1567ceaa3f
commit 07e957120d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/addi_apci_1516.c
View file

@ -62,7 +62,7 @@ struct apci1516_boardinfo {
unsigned short device; unsigned short device;
int di_nchan; int di_nchan;
int do_nchan; int do_nchan;
int has_timer; int has_wdog;
}; };
static const struct apci1516_boardinfo apci1516_boardtypes[] = { static const struct apci1516_boardinfo apci1516_boardtypes[] = {
@ -75,12 +75,12 @@ static const struct apci1516_boardinfo apci1516_boardtypes[] = {
.device = PCI_DEVICE_ID_APCI1516, .device = PCI_DEVICE_ID_APCI1516,
.di_nchan = 8, .di_nchan = 8,
.do_nchan = 8, .do_nchan = 8,
.has_timer = 1, .has_wdog = 1,
}, { }, {
.name = "apci2016", .name = "apci2016",
.device = PCI_DEVICE_ID_APCI2016, .device = PCI_DEVICE_ID_APCI2016,
.do_nchan = 16, .do_nchan = 16,
.has_timer = 1, .has_wdog = 1,
}, },
}; };
@ -201,7 +201,7 @@ static int apci1516_reset(struct comedi_device *dev)
const struct apci1516_boardinfo *this_board = comedi_board(dev); const struct apci1516_boardinfo *this_board = comedi_board(dev);
struct apci1516_private *devpriv = dev->private; struct apci1516_private *devpriv = dev->private;
if (!this_board->has_timer) if (!this_board->has_wdog)
return 0; return 0;
outw(0x0, dev->iobase + APCI1516_DO_REG); outw(0x0, dev->iobase + APCI1516_DO_REG);
@ -283,7 +283,7 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise Timer Subdevice Structures */ /* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
if (this_board->has_timer) { if (this_board->has_wdog) {
s->type = COMEDI_SUBD_TIMER; s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_WRITEABLE; s->subdev_flags = SDF_WRITEABLE;
s->n_chan = 1; s->n_chan = 1;