From 7ce62a18d2042d2fba18db2c5fa035d9129ec37f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 10 Apr 2013 11:30:11 -0700 Subject: [PATCH] --- yaml --- r: 364110 b: refs/heads/master c: 43535526367196d7dcf11f563b0e418b1efe00fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/8255_pci.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ff0b62a693b5..9cef907903b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55d2a208923e655d3453b66676f957b0d60be108 +refs/heads/master: 43535526367196d7dcf11f563b0e418b1efe00fd diff --git a/trunk/drivers/staging/comedi/drivers/8255_pci.c b/trunk/drivers/staging/comedi/drivers/8255_pci.c index 808460bbd32e..fff1c08a93fb 100644 --- a/trunk/drivers/staging/comedi/drivers/8255_pci.c +++ b/trunk/drivers/staging/comedi/drivers/8255_pci.c @@ -187,8 +187,6 @@ static int pci_8255_auto_attach(struct comedi_device *dev, const struct pci_8255_boardinfo *board = NULL; struct pci_8255_private *devpriv; struct comedi_subdevice *s; - resource_size_t iobase; - unsigned long len; int ret; int i; @@ -207,15 +205,14 @@ static int pci_8255_auto_attach(struct comedi_device *dev, ret = comedi_pci_enable(dev); if (ret) return ret; - iobase = pci_resource_start(pcidev, board->dio_badr); - len = pci_resource_len(pcidev, board->dio_badr); if (board->is_mmio) { - devpriv->mmio_base = ioremap(iobase, len); + devpriv->mmio_base = pci_ioremap_bar(pcidev, board->dio_badr); if (!devpriv->mmio_base) return -ENOMEM; + } else { + dev->iobase = pci_resource_start(pcidev, board->dio_badr); } - dev->iobase = iobase; /* * One, two, or four subdevices are setup by this driver depending @@ -227,6 +224,8 @@ static int pci_8255_auto_attach(struct comedi_device *dev, return ret; for (i = 0; i < board->n_8255; i++) { + unsigned long iobase; + s = &dev->subdevices[i]; if (board->is_mmio) { iobase = (unsigned long)(devpriv->mmio_base + (i * 4));