dect
/
linux-2.6
Archived
13
0
Fork 0

Staging: comedi: s526: Get rid of global variable 'cmReg'.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ian Abbott 2009-09-21 15:35:42 -04:00 committed by Greg Kroah-Hartman
parent 10f27014f4
commit ca98ee7bb4
1 changed files with 5 additions and 2 deletions

View File

@ -126,10 +126,10 @@ struct counter_mode_register_t {
unsigned short reserved:1;
};
union {
union cmReg {
struct counter_mode_register_t reg;
unsigned short value;
} cmReg;
};
#define MAX_GPCT_CONFIG_DATA 6
@ -285,6 +285,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int i, n;
/* short value; */
/* int subdev_channel = 0; */
union cmReg cmReg;
printk("comedi%d: s526: ", dev->minor);
@ -516,6 +517,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */
int i;
short value;
union cmReg cmReg;
/* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel); */
@ -741,6 +743,7 @@ static int s526_gpct_winsn(struct comedi_device *dev,
{
int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */
short value;
union cmReg cmReg;
printk("s526: GPCT_INSN_WRITE on channel %d\n", subdev_channel);
cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));