Get rid of global variable 'cmReg'.

diff --git a/comedi/drivers/s526.c b/comedi/drivers/s526.c
index 0b350d778bd054828b2e48543887c1c110f43265..f67925e5db3c5004764d801806365a8f8ec3d6a7 100644 (file)
--- a/comedi/drivers/s526.c
+++ b/comedi/drivers/s526.c
@@ -126,10 +126,10 @@ typedef struct {
        unsigned short reserved:1;
 } counter_mode_register_t;
 
-union {
+union cmReg {
        counter_mode_register_t reg;
        unsigned short value;
-} cmReg;
+};
 
 #define MAX_GPCT_CONFIG_DATA 6
 
@@ -277,6 +277,7 @@ static int s526_attach(comedi_device * dev, comedi_devconfig * it)
        int i, n;
 //      sampl_t value;
 //      int subdev_channel = 0;
+       union cmReg cmReg;
 
        printk("comedi%d: s526: ", dev->minor);
 
@@ -506,6 +507,7 @@ static int s526_gpct_insn_config(comedi_device * dev, comedi_subdevice * s,
        int subdev_channel = CR_CHAN(insn->chanspec);   // Unpack chanspec
        int i;
        sampl_t value;
+       union cmReg cmReg;
 
 //        printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel);
 
@@ -719,6 +721,7 @@ static int s526_gpct_winsn(comedi_device * dev, comedi_subdevice * s,
 {
        int subdev_channel = CR_CHAN(insn->chanspec);   // Unpack chanspec
        sampl_t 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));