From 4fbb2e92ca663cabcc096e139bc8c58a1b971333 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 30 Sep 2013 17:51:35 -0700 Subject: [PATCH] staging: comedi: ni_at_ao: remove 'cfg2' from private data This member of the private data is initialized to '0' during the board reset then never changed. Just remove it. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_at_ao.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 62d4d858e041..bba5bc0c036b 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c @@ -142,9 +142,7 @@ struct atao_board { }; struct atao_private { - unsigned short cfg1; - unsigned short cfg2; unsigned short cfg3; /* Used for AO readback */ @@ -164,8 +162,7 @@ static void atao_reset(struct comedi_device *dev) outb(0x03, dev->iobase + ATAO_82C53_CNTR1); outb(CNTRSEL0 | RWSEL0 | MODESEL2, dev->iobase + ATAO_82C53_CNTRCMD); - devpriv->cfg2 = 0; - outw(devpriv->cfg2, dev->iobase + ATAO_CFG2); + outw(0, dev->iobase + ATAO_CFG2); devpriv->cfg3 = 0; outw(devpriv->cfg3, dev->iobase + ATAO_CFG3); @@ -294,15 +291,15 @@ static int atao_calib_insn_write(struct comedi_device *dev, bitstring = ((chan & 0x7) << 8) | (data[insn->n - 1] & 0xff); for (bit = 1 << (11 - 1); bit; bit >>= 1) { - outw(devpriv->cfg2 | ((bit & bitstring) ? SDATA : 0), + outw(((bit & bitstring) ? SDATA : 0), dev->iobase + ATAO_CFG2); - outw(devpriv->cfg2 | SCLK | ((bit & bitstring) ? SDATA : 0), + outw(SCLK | ((bit & bitstring) ? SDATA : 0), dev->iobase + ATAO_CFG2); } /* strobe the appropriate caldac */ - outw(devpriv->cfg2 | (((chan >> 3) + 1) << 14), + outw((((chan >> 3) + 1) << 14), dev->iobase + ATAO_CFG2); - outw(devpriv->cfg2, dev->iobase + ATAO_CFG2); + outw(0, dev->iobase + ATAO_CFG2); return insn->n; } -- 2.34.1