tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Ian Abbott and committed by Greg Kroah-Hartman ca98ee7b 10f27014

+5 -2
unified split
+5 -2
drivers/staging/comedi/drivers/s526.c
··· 126 unsigned short reserved:1; 127 }; 128 129 - union { 130 struct counter_mode_register_t reg; 131 unsigned short value; 132 - } cmReg; 133 134 #define MAX_GPCT_CONFIG_DATA 6 135 ··· 285 int i, n; 286 /* short value; */ 287 /* int subdev_channel = 0; */ 288 289 printk("comedi%d: s526: ", dev->minor); 290 ··· 517 int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ 518 int i; 519 short value; 520 521 /* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel); */ 522 ··· 743 { 744 int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ 745 short value; 746 747 printk("s526: GPCT_INSN_WRITE on channel %d\n", subdev_channel); 748 cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));
··· 126 unsigned short reserved:1; 127 }; 128 129 + union cmReg { 130 struct counter_mode_register_t reg; 131 unsigned short value; 132 + }; 133 134 #define MAX_GPCT_CONFIG_DATA 6 135 ··· 285 int i, n; 286 /* short value; */ 287 /* int subdev_channel = 0; */ 288 + union cmReg cmReg; 289 290 printk("comedi%d: s526: ", dev->minor); 291 ··· 516 int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ 517 int i; 518 short value; 519 + union cmReg cmReg; 520 521 /* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n", subdev_channel); */ 522 ··· 741 { 742 int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ 743 short value; 744 + union cmReg cmReg; 745 746 printk("s526: GPCT_INSN_WRITE on channel %d\n", subdev_channel); 747 cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));