Commit c6be1548 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_mio_common: (!foo) preferred over (foo == NULL)

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56e97078
...@@ -755,7 +755,7 @@ static int ni_request_ai_mite_channel(struct comedi_device *dev) ...@@ -755,7 +755,7 @@ static int ni_request_ai_mite_channel(struct comedi_device *dev)
BUG_ON(devpriv->ai_mite_chan); BUG_ON(devpriv->ai_mite_chan);
devpriv->ai_mite_chan = devpriv->ai_mite_chan =
mite_request_channel(devpriv->mite, devpriv->ai_mite_ring); mite_request_channel(devpriv->mite, devpriv->ai_mite_ring);
if (devpriv->ai_mite_chan == NULL) { if (!devpriv->ai_mite_chan) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
dev_err(dev->class_dev, dev_err(dev->class_dev,
"failed to reserve mite dma channel for analog input\n"); "failed to reserve mite dma channel for analog input\n");
...@@ -776,7 +776,7 @@ static int ni_request_ao_mite_channel(struct comedi_device *dev) ...@@ -776,7 +776,7 @@ static int ni_request_ao_mite_channel(struct comedi_device *dev)
BUG_ON(devpriv->ao_mite_chan); BUG_ON(devpriv->ao_mite_chan);
devpriv->ao_mite_chan = devpriv->ao_mite_chan =
mite_request_channel(devpriv->mite, devpriv->ao_mite_ring); mite_request_channel(devpriv->mite, devpriv->ao_mite_ring);
if (devpriv->ao_mite_chan == NULL) { if (!devpriv->ao_mite_chan) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
dev_err(dev->class_dev, dev_err(dev->class_dev,
"failed to reserve mite dma channel for analog outut\n"); "failed to reserve mite dma channel for analog outut\n");
...@@ -802,7 +802,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev, ...@@ -802,7 +802,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev,
mite_chan = mite_chan =
mite_request_channel(devpriv->mite, mite_request_channel(devpriv->mite,
devpriv->gpct_mite_ring[gpct_index]); devpriv->gpct_mite_ring[gpct_index]);
if (mite_chan == NULL) { if (!mite_chan) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
dev_err(dev->class_dev, dev_err(dev->class_dev,
"failed to reserve mite dma channel for counter\n"); "failed to reserve mite dma channel for counter\n");
...@@ -828,7 +828,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device *dev) ...@@ -828,7 +828,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device *dev)
BUG_ON(devpriv->cdo_mite_chan); BUG_ON(devpriv->cdo_mite_chan);
devpriv->cdo_mite_chan = devpriv->cdo_mite_chan =
mite_request_channel(devpriv->mite, devpriv->cdo_mite_ring); mite_request_channel(devpriv->mite, devpriv->cdo_mite_ring);
if (devpriv->cdo_mite_chan == NULL) { if (!devpriv->cdo_mite_chan) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
dev_err(dev->class_dev, dev_err(dev->class_dev,
"failed to reserve mite dma channel for correlated digital output\n"); "failed to reserve mite dma channel for correlated digital output\n");
...@@ -1657,7 +1657,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev) ...@@ -1657,7 +1657,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
comedi_buf_write_alloc(s, s->async->prealloc_bufsz); comedi_buf_write_alloc(s, s->async->prealloc_bufsz);
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
if (devpriv->ai_mite_chan == NULL) { if (!devpriv->ai_mite_chan) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
return -EIO; return -EIO;
} }
...@@ -3699,7 +3699,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev, ...@@ -3699,7 +3699,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev,
DIO_Serial_IO_In_Progress_St goes high one bit too early. */ DIO_Serial_IO_In_Progress_St goes high one bit too early. */
udelay((devpriv->serial_interval_ns + 999) / 1000); udelay((devpriv->serial_interval_ns + 999) / 1000);
if (data_in != NULL) if (data_in)
*data_in = ni_stc_readw(dev, DIO_Serial_Input_Register); *data_in = ni_stc_readw(dev, DIO_Serial_Input_Register);
Error: Error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment