Skip to content

Commit

Permalink
staging: comedi: dt3000: change return type of dt3k_send_cmd to void
Browse files Browse the repository at this point in the history
None of the callers check the return value. Just make it a void.

Flip the status check at the end of the function to check for an
error before outputing the dev_dbg(). Use __func__ for the function
name in the message.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 26, 2012
1 parent d3bf217 commit 0014048
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static void debug_intr_flags(unsigned int flags)

#define TIMEOUT 100

static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
static void dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
{
struct dt3k_private *devpriv = dev->private;
int i;
Expand All @@ -294,13 +294,10 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
break;
udelay(1);
}
if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR)
return 0;

dev_dbg(dev->class_dev, "dt3k_send_cmd() timeout/error status=0x%04x\n",
status);

return -ETIME;
if ((status & DT3000_COMPLETION_MASK) != DT3000_NOERROR)
dev_dbg(dev->class_dev, "%s: timeout/error status=0x%04x\n",
__func__, status);
}

static unsigned int dt3k_readsingle(struct comedi_device *dev,
Expand Down Expand Up @@ -365,10 +362,9 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev,
static int dt3k_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{
struct dt3k_private *devpriv = dev->private;
int ret;

writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
ret = dt3k_send_cmd(dev, CMD_STOP);
dt3k_send_cmd(dev, CMD_STOP);

writew(0, devpriv->io_addr + DPR_Int_Mask);

Expand Down Expand Up @@ -560,7 +556,6 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
unsigned int chan, range, aref;
unsigned int divider;
unsigned int tscandiv;
int ret;
unsigned int mode;

for (i = 0; i < cmd->chanlist_len; i++) {
Expand Down Expand Up @@ -595,15 +590,15 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
writew(AI_FIFO_DEPTH / 2, devpriv->io_addr + DPR_Params(7));

writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
ret = dt3k_send_cmd(dev, CMD_CONFIG);
dt3k_send_cmd(dev, CMD_CONFIG);

writew(DT3000_ADFULL | DT3000_ADSWERR | DT3000_ADHWERR,
devpriv->io_addr + DPR_Int_Mask);

debug_n_ints = 0;

writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
ret = dt3k_send_cmd(dev, CMD_START);
dt3k_send_cmd(dev, CMD_START);

return 0;
}
Expand Down

0 comments on commit 0014048

Please sign in to comment.