mite_iobase is gone

diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 9898fda6d429d0cef858155dae8fe0322dedab44..494807bc382268effb61e5c3ef73e1173f16db04 100644 (file)
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -698,7 +698,7 @@ static int labpc_attach(comedi_device *dev, comedi_devconfig *it)
                        }
                        ret = mite_setup(devpriv->mite);
                        if(ret < 0) return ret;
-                       iobase = mite_iobase(devpriv->mite);
+                       iobase = (unsigned long) devpriv->mite->daq_io_addr;
                        irq = mite_irq(devpriv->mite);
                        break;
                case pcmcia_bustype:

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 54ee4fb86890a0328ab75bda9035ca2b91c973ac..1f6552edc6e9c981fba00667be70fc5bab74e1b2 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -682,12 +682,12 @@ typedef struct{
 
 /* How we access registers */
 
-#define ni_writel(a,b) (writel((a), (void*)(dev->iobase + (b))))
-#define ni_readl(a)    (readl((void*)(dev->iobase + (a))))
-#define ni_writew(a,b) (writew((a), (void*)(dev->iobase + (b))))
-#define ni_readw(a)    (readw((void*)(dev->iobase + (a))))
-#define ni_writeb(a,b) (writeb((a), (void*)(dev->iobase + (b))))
-#define ni_readb(a)    (readb((void*)(dev->iobase + (a))))
+#define ni_writel(a,b) (writel((a), devpriv->mite->daq_io_addr + (b)))
+#define ni_readl(a)    (readl(devpriv->mite->daq_io_addr + (a)))
+#define ni_writew(a,b) (writew((a), devpriv->mite->daq_io_addr + (b)))
+#define ni_readw(a)    (readw(devpriv->mite->daq_io_addr + (a)))
+#define ni_writeb(a,b) (writeb((a), devpriv->mite->daq_io_addr + (b)))
+#define ni_readb(a)    (readb(devpriv->mite->daq_io_addr + (a)))
 
 /* How we access STC registers */
 
@@ -775,7 +775,6 @@ static int pcimio_attach(comedi_device *dev,comedi_devconfig *it)
                printk(" error setting up mite\n");
                return ret;
        }
-       dev->iobase = mite_iobase(devpriv->mite);
 
        dev->irq=mite_irq(devpriv->mite);