iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: adv_pci_dio: use a const pointer to the diosubd_data

Browse Source 
For aesthetics, use a const pointer to access the diosubd_data in the
boardinfo when doing the (*auto_attach)..

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-11-18 10:07:06 -07:00 committed by Greg Kroah-Hartman
parent afe5c118bd
commit a1132fc1bb
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/adv_pci_dio.c
View File

@ -532,6 +532,7 @@ static int pci_dio_auto_attach(struct comedi_device *dev,
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct dio_boardtype *board = NULL;
const struct diosubd_data *d;
struct comedi_subdevice *s;
int ret, subdev, i, j;
@ -555,32 +556,38 @@ static int pci_dio_auto_attach(struct comedi_device *dev,
return ret;
subdev = 0;
for (i = 0; i < MAX_DI_SUBDEVS; i++)
if (board->sdi[i].chans) {
for (i = 0; i < MAX_DI_SUBDEVS; i++) {
d = &board->sdi[i];
if (d->chans) {
s = &dev->subdevices[subdev++];
pci_dio_add_di(dev, s, &board->sdi[i]);
pci_dio_add_di(dev, s, d);
}
}
for (i = 0; i < MAX_DO_SUBDEVS; i++)
if (board->sdo[i].chans) {
for (i = 0; i < MAX_DO_SUBDEVS; i++) {
d = &board->sdo[i];
if (d->chans) {
s = &dev->subdevices[subdev++];
pci_dio_add_do(dev, s, &board->sdo[i]);
pci_dio_add_do(dev, s, d);
}
}
for (i = 0; i < MAX_DIO_SUBDEVG; i++)
for (j = 0; j < board->sdio[i].regs; j++) {
for (i = 0; i < MAX_DIO_SUBDEVG; i++) {
d = &board->sdio[i];
for (j = 0; j < d->regs; j++) {
s = &dev->subdevices[subdev++];
ret = subdev_8255_init(dev, s, NULL,
board->sdio[i].addr +
j * I8255_SIZE);
d->addr + j * I8255_SIZE);
if (ret)
return ret;
}
}
if (board->boardid.chans) {
d = &board->boardid;
if (d->chans) {
s = &dev->subdevices[subdev++];
s->type = COMEDI_SUBD_DI;
pci_dio_add_di(dev, s, &board->boardid);
pci_dio_add_di(dev, s, d);
}
if (board->timer_regbase) {