]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_mio_common: don't pass config options to ni_E_init()
authorIan Abbott <abbotti@mev.co.uk>
Fri, 14 Sep 2012 16:34:18 +0000 (17:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 12:09:06 +0000 (05:09 -0700)
`ni_E_init()` doesn't use the second parameter pointing to a `struct
comedi_devconfig` passed from a comedi `attach` handler, so remove the
parameter.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_atmio.c
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/ni_mio_cs.c
drivers/staging/comedi/drivers/ni_pcimio.c

index 6448373878ed117a72afb1c664ed2e25e198dba8..cac25572f6bb436b94a45186986de1af331f2c28 100644 (file)
@@ -489,7 +489,7 @@ static int ni_atmio_attach(struct comedi_device *dev,
 
        /* generic E series stuff in ni_mio_common.c */
 
-       ret = ni_E_init(dev, it);
+       ret = ni_E_init(dev);
        if (ret < 0)
                return ret;
 
index 68f3bddaf7532242ccbec50d99fb43cf3291a167..8fd967aec3b35c98738b584392bf753326777037 100644 (file)
@@ -4404,7 +4404,7 @@ static int ni_alloc_private(struct comedi_device *dev)
        return 0;
 };
 
-static int ni_E_init(struct comedi_device *dev, struct comedi_devconfig *it)
+static int ni_E_init(struct comedi_device *dev)
 {
        struct comedi_subdevice *s;
        unsigned j;
index b85765d266c2f0547d35bd86ebb55f6435f5a652..9acaad2c582177cd20c0275422f874bc49cca668 100644 (file)
@@ -382,7 +382,7 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        devpriv->stc_writel = &win_out2;
        devpriv->stc_readl = &win_in2;
 
-       ret = ni_E_init(dev, it);
+       ret = ni_E_init(dev);
 
        if (ret < 0)
                return ret;
index 89f4d43c6d08bd4b9f5ca4164f6642b7b562e466..fa008fa9401ea36bd03b39526f9017b57170bc11 100644 (file)
@@ -1659,7 +1659,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                }
        }
 
-       ret = ni_E_init(dev, it);
+       ret = ni_E_init(dev);
        if (ret < 0)
                return ret;