lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: cb_pcidda: cleanup DADATA define

Browse Source 
Rename the define used for the D/A Data register so that is has
namespace with this driver. Change the define so that it takes
the channel as a parameter to calculate the correct register
offset.

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>
This commit is contained in:
H Hartley Sweeten
2012-10-24 16:33:45 -07:00
committed by Greg Kroah-Hartman
parent be2fcdbf91
commit 87c4e2c62e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/cb_pcidda.c
View File

@@ -97,7 +97,7 @@
/* manual says to set this bit with no explanation */
#define DUMMY_BIT 0x40
#define DADATA 8 /* FIRST D/A DATA REGISTER (0) */
#define CB_DDA_DA_DATA_REG(x) (0x08 + ((x) * 2))
static const struct comedi_lrange cb_pcidda_ranges = {
6, {
@@ -393,7 +393,7 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev,
outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG);
/* write data */
outw(data[0], dev->iobase + DADATA + channel * 2);
outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel));
/* return the number of samples read/written */
return 1;