Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging/comedi/adl_pci8164: Don't assign string

Browse Source 
Assigning a string is really bad,
and since we only have 1 char strings here we
can simply use a char to store the value and change the format specifier.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-01-29 00:36:39 +01:00 committed by Greg Kroah-Hartman
parent bc3954b814
commit e21545449b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/comedi/drivers/adl_pci8164.c
View File

@ -62,35 +62,35 @@ static void adl_pci8164_insn_read(struct comedi_device *dev,
char *action, unsigned short offset)
{
int axis, axis_reg;
char *axisname;
char axisname;
axis = CR_CHAN(insn->chanspec);
switch (axis) {
case 0:
axis_reg = PCI8164_AXIS_X;
axisname = "X";
axisname = 'X';
break;
case 1:
axis_reg = PCI8164_AXIS_Y;
axisname = "Y";
axisname = 'Y';
break;
case 2:
axis_reg = PCI8164_AXIS_Z;
axisname = "Z";
axisname = 'Z';
break;
case 3:
axis_reg = PCI8164_AXIS_U;
axisname = "U";
axisname = 'U';
break;
default:
axis_reg = PCI8164_AXIS_X;
axisname = "X";
axisname = 'X';
}
data[0] = inw(dev->iobase + axis_reg + offset);
dev_dbg(dev->class_dev,
"pci8164 %s read -> %04X:%04X on axis %s\n",
"pci8164 %s read -> %04X:%04X on axis %c\n",
action, data[0], data[1], axisname);
}
@ -142,36 +142,36 @@ static void adl_pci8164_insn_out(struct comedi_device *dev,
{
unsigned int axis, axis_reg;
char *axisname;
char axisname;
axis = CR_CHAN(insn->chanspec);
switch (axis) {
case 0:
axis_reg = PCI8164_AXIS_X;
axisname = "X";
axisname = 'X';
break;
case 1:
axis_reg = PCI8164_AXIS_Y;
axisname = "Y";
axisname = 'Y';
break;
case 2:
axis_reg = PCI8164_AXIS_Z;
axisname = "Z";
axisname = 'Z';
break;
case 3:
axis_reg = PCI8164_AXIS_U;
axisname = "U";
axisname = 'U';
break;
default:
axis_reg = PCI8164_AXIS_X;
axisname = "X";
axisname = 'X';
}
outw(data[0], dev->iobase + axis_reg + offset);
dev_dbg(dev->class_dev,
"pci8164 %s write -> %04X:%04X on axis %s\n",
"pci8164 %s write -> %04X:%04X on axis %c\n",
action, data[0], data[1], axisname);
}