Skip to content

Commit

Permalink
staging: comedi: ni_mio_common: don't pass config options to ni_E_init()
Browse files Browse the repository at this point in the history
`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>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 21b74c2 commit 5b6137d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/ni_atmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/ni_mio_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/ni_mio_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/ni_pcimio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 5b6137d

Please sign in to comment.