diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-29 15:01:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:55:15 -0700 |
| commit | 3bb7c3abe34349a5f3615159d80aaee25c34e2a7 (patch) | |
| tree | d614c67bd894d968b1d285402de544ab06b3a08a /drivers/staging/comedi/drivers/ni_pcimio.c | |
| parent | 7a9e24eb4c40ea3afcd64269353c4f6c8139f0eb (diff) | |
staging: comedi: mite: pass comedi_device to mite_setup()
For aesthetics, pass the comedi_device to mite_setup() and mite_setup2()
so that the dev->class_dev can be used in the dev_{level} message to make
the messages have consistancy with the other comedi drivers.
Remove the extra dev_warn() noise in the drivers when mite_setup() fails.
Rename the 'use_iodwbsr_1' parameter and change it to a bool.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_pcimio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 22c0e95dc174..b95019b7205f 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1176,11 +1176,9 @@ static int pcimio_auto_attach(struct comedi_device *dev, if (board->reg_type == ni_reg_6713) devpriv->is_6713 = 1; - ret = mite_setup(devpriv->mite); - if (ret < 0) { - dev_warn(dev->class_dev, "error setting up mite\n"); + ret = mite_setup(dev, devpriv->mite); + if (ret < 0) return ret; - } devpriv->ai_mite_ring = mite_alloc_ring(devpriv->mite); if (devpriv->ai_mite_ring == NULL) |