[PATCH 11/15] staging: comedi: 8255_pci: tidy up pci_8255_mmio()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The 8255 driver (*io) callback now includes the comedi_device pointer.
Using this we can get the ioremap'ed base address.

Instead of passing the (cast) mmio address to subdev_8255_init(), pass
the 'iobase' of the 8255 registers (i * 4).

Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/staging/comedi/drivers/8255_pci.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index 81856ef..c303e98 100644
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -193,13 +193,11 @@ static int pci_8255_mite_init(struct pci_dev *pcidev)
 static int pci_8255_mmio(struct comedi_device *dev,
 			 int dir, int port, int data, unsigned long iobase)
 {
-	void __iomem *mmio_base = (void __iomem *)iobase;
-
 	if (dir) {
-		writeb(data, mmio_base + port);
+		writeb(data, dev->mmio + iobase + port);
 		return 0;
 	}
-	return readb(mmio_base  + port);
+	return readb(dev->mmio + iobase  + port);
 }
 
 static int pci_8255_auto_attach(struct comedi_device *dev,
@@ -253,8 +251,7 @@ static int pci_8255_auto_attach(struct comedi_device *dev,
 
 		s = &dev->subdevices[i];
 		if (is_mmio) {
-			iobase = (unsigned long)(dev->mmio + (i * 4));
-			ret = subdev_8255_init(dev, s, pci_8255_mmio, iobase);
+			ret = subdev_8255_init(dev, s, pci_8255_mmio, i * 4);
 		} else {
 			iobase = dev->iobase + (i * 4);
 			ret = subdev_8255_init(dev, s, NULL, iobase);
-- 
2.0.3

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux