From adb7a4777b47f23fdc67a02b195f3ad4b61946ff Mon Sep 17 00:00:00 2001 From: Chase Southwood Date: Sun, 17 Aug 2014 22:43:02 -0500 Subject: [PATCH] staging: comedi: dt2801: change function return type to void cppcheck was complaining that the variable 'stat' is being reassigned before the old value is used. Upon inspection, I found that dt2801_writecmd() cannot fail, always returns 0, and most callers already do not bother with assigning its return value anyway, so it makes sense to just change the return type for this function from int to void, and remove the two assignments to 'stat'. Signed-off-by: Chase Southwood Reviewed-by: Ian Abbott Cc: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/dt2801.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c index ad8ba0be4878..c16d468625ab 100644 --- a/drivers/staging/comedi/drivers/dt2801.c +++ b/drivers/staging/comedi/drivers/dt2801.c @@ -309,7 +309,7 @@ static int dt2801_wait_for_ready(struct comedi_device *dev) return -ETIME; } -static int dt2801_writecmd(struct comedi_device *dev, int command) +static void dt2801_writecmd(struct comedi_device *dev, int command) { int stat; @@ -323,8 +323,6 @@ static int dt2801_writecmd(struct comedi_device *dev, int command) if (!(stat & DT_S_READY)) dev_dbg(dev->class_dev, "!ready in %s, ignoring\n", __func__); outb_p(command, dev->iobase + DT2801_CMD); - - return 0; } static int dt2801_reset(struct comedi_device *dev) @@ -380,7 +378,7 @@ static int probe_number_of_ai_chans(struct comedi_device *dev) int data; for (n_chans = 0; n_chans < 16; n_chans++) { - stat = dt2801_writecmd(dev, DT_C_READ_ADIM); + dt2801_writecmd(dev, DT_C_READ_ADIM); dt2801_writedata(dev, 0); dt2801_writedata(dev, n_chans); stat = dt2801_readdata2(dev, &data); @@ -451,7 +449,7 @@ static int dt2801_ai_insn_read(struct comedi_device *dev, int i; for (i = 0; i < insn->n; i++) { - stat = dt2801_writecmd(dev, DT_C_READ_ADIM); + dt2801_writecmd(dev, DT_C_READ_ADIM); dt2801_writedata(dev, CR_RANGE(insn->chanspec)); dt2801_writedata(dev, CR_CHAN(insn->chanspec)); stat = dt2801_readdata2(dev, &d); -- 2.34.1