Commit 33e73e00 authored by Ravishankar's avatar Ravishankar Committed by Greg Kroah-Hartman

Staging: comedi: fix warning issue in unioxx5.c

This is a patch to the unioxx5.c file that fixes up a  warning found by the checkpatch.pl tool
Signed-off-by: default avatarRavishankar <ravishankarkm32@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e9d1cf89
...@@ -75,8 +75,10 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5), ...@@ -75,8 +75,10 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5),
/* 'private' structure for each subdevice */ /* 'private' structure for each subdevice */
struct unioxx5_subd_priv { struct unioxx5_subd_priv {
int usp_iobase; int usp_iobase;
unsigned char usp_module_type[12]; /* 12 modules. each can be 70L or 73L */ /* 12 modules. each can be 70L or 73L */
unsigned char usp_extra_data[12][4]; /* for saving previous written value for analog modules */ unsigned char usp_module_type[12];
/* for saving previous written value for analog modules */
unsigned char usp_extra_data[12][4];
unsigned char usp_prev_wr_val[3]; /* previous written value */ unsigned char usp_prev_wr_val[3]; /* previous written value */
unsigned char usp_prev_cn_val[3]; /* previous channel value */ unsigned char usp_prev_cn_val[3]; /* previous channel value */
}; };
...@@ -169,7 +171,7 @@ static int unioxx5_attach(struct comedi_device *dev, ...@@ -169,7 +171,7 @@ static int unioxx5_attach(struct comedi_device *dev,
return -1; return -1;
} }
printk("attached\n"); printk(KERN_INFO "attached\n");
return 0; return 0;
} }
...@@ -181,7 +183,8 @@ static int unioxx5_subdev_read(struct comedi_device *dev, ...@@ -181,7 +183,8 @@ static int unioxx5_subdev_read(struct comedi_device *dev,
int channel, type; int channel, type;
channel = CR_CHAN(insn->chanspec); channel = CR_CHAN(insn->chanspec);
type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */ /* defining module type(analog or digital) */
type = usp->usp_module_type[channel / 2];
if (type == MODULE_DIGITAL) { if (type == MODULE_DIGITAL) {
if (!__unioxx5_digital_read(usp, data, channel, dev->minor)) if (!__unioxx5_digital_read(usp, data, channel, dev->minor))
...@@ -202,7 +205,8 @@ static int unioxx5_subdev_write(struct comedi_device *dev, ...@@ -202,7 +205,8 @@ static int unioxx5_subdev_write(struct comedi_device *dev,
int channel, type; int channel, type;
channel = CR_CHAN(insn->chanspec); channel = CR_CHAN(insn->chanspec);
type = usp->usp_module_type[channel / 2]; /* defining module type(analog or digital) */ /* defining module type(analog or digital) */
type = usp->usp_module_type[channel / 2];
if (type == MODULE_DIGITAL) { if (type == MODULE_DIGITAL) {
if (!__unioxx5_digital_write(usp, data, channel, dev->minor)) if (!__unioxx5_digital_write(usp, data, channel, dev->minor))
...@@ -261,9 +265,12 @@ static int unioxx5_insn_config(struct comedi_device *dev, ...@@ -261,9 +265,12 @@ static int unioxx5_insn_config(struct comedi_device *dev,
* change channel type on input or output) * * change channel type on input or output) *
\* */ \* */
outb(1, usp->usp_iobase + 0); outb(1, usp->usp_iobase + 0);
outb(flags, usp->usp_iobase + channel_offset); /* changes type of _one_ channel */ /* changes type of _one_ channel */
outb(0, usp->usp_iobase + 0); /* sets channels bank to 0(allows directly input/output) */ outb(flags, usp->usp_iobase + channel_offset);
usp->usp_prev_cn_val[channel_offset - 1] = flags; /* saves written value */ /* sets channels bank to 0(allows directly input/output) */
outb(0, usp->usp_iobase + 0);
/* saves written value */
usp->usp_prev_cn_val[channel_offset - 1] = flags;
return 0; return 0;
} }
...@@ -304,14 +311,15 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev, ...@@ -304,14 +311,15 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
} }
usp->usp_iobase = subdev_iobase; usp->usp_iobase = subdev_iobase;
printk("comedi%d: |", minor); printk(KERN_INFO "comedi%d: |", minor);
/* defining modules types */ /* defining modules types */
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
to = 10000; to = 10000;
__unioxx5_analog_config(usp, i * 2); __unioxx5_analog_config(usp, i * 2);
outb(i + 1, subdev_iobase + 5); /* sends channel number to card */ /* sends channel number to card */
outb(i + 1, subdev_iobase + 5);
outb('H', subdev_iobase + 6); /* requests EEPROM world */ outb('H', subdev_iobase + 6); /* requests EEPROM world */
while (!(inb(subdev_iobase + 0) & TxBE)) while (!(inb(subdev_iobase + 0) & TxBE))
; /* waits while writting will be allowed */ ; /* waits while writting will be allowed */
...@@ -346,9 +354,10 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev, ...@@ -346,9 +354,10 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
subdev->range_table = &range_digital; subdev->range_table = &range_digital;
subdev->insn_read = unioxx5_subdev_read; subdev->insn_read = unioxx5_subdev_read;
subdev->insn_write = unioxx5_subdev_write; subdev->insn_write = unioxx5_subdev_write;
subdev->insn_config = unioxx5_insn_config; /* for digital modules only!!! */ /* for digital modules only!!! */
subdev->insn_config = unioxx5_insn_config;
printk("subdevice configured\n"); printk(KERN_INFO "subdevice configured\n");
return 0; return 0;
} }
...@@ -367,7 +376,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp, ...@@ -367,7 +376,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
return 0; return 0;
} }
val = usp->usp_prev_wr_val[channel_offset - 1]; /* getting previous written value */ /* getting previous written value */
val = usp->usp_prev_wr_val[channel_offset - 1];
if (*data) if (*data)
val |= mask; val |= mask;
...@@ -375,7 +385,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp, ...@@ -375,7 +385,8 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
val &= ~mask; val &= ~mask;
outb(val, usp->usp_iobase + channel_offset); outb(val, usp->usp_iobase + channel_offset);
usp->usp_prev_wr_val[channel_offset - 1] = val; /* saving new written value */ /* saving new written value */
usp->usp_prev_wr_val[channel_offset - 1] = val;
return 1; return 1;
} }
...@@ -399,7 +410,6 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp, ...@@ -399,7 +410,6 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
if (channel_offset > 1) if (channel_offset > 1)
channel -= 2 << channel_offset; /* this operation is created for correct readed value to 0 or 1 */ channel -= 2 << channel_offset; /* this operation is created for correct readed value to 0 or 1 */
*data >>= channel; *data >>= channel;
return 1; return 1;
} }
...@@ -444,7 +454,8 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp, ...@@ -444,7 +454,8 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
usp->usp_extra_data[module][i] = (unsigned char)((*data & 0xFF00) >> 8); usp->usp_extra_data[module][i] = (unsigned char)((*data & 0xFF00) >> 8);
/* while(!((inb(usp->usp_iobase + 0)) & TxBE)); */ /* while(!((inb(usp->usp_iobase + 0)) & TxBE)); */
outb(module + 1, usp->usp_iobase + 5); /* sending module number to card(1 .. 12) */ /* sending module number to card(1 .. 12) */
outb(module + 1, usp->usp_iobase + 5);
outb('W', usp->usp_iobase + 6); /* sends (W)rite command to module */ outb('W', usp->usp_iobase + 6); /* sends (W)rite command to module */
/* sending for bytes to module(one byte per cycle iteration) */ /* sending for bytes to module(one byte per cycle iteration) */
...@@ -475,7 +486,8 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp, ...@@ -475,7 +486,8 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
} }
__unioxx5_analog_config(usp, channel); __unioxx5_analog_config(usp, channel);
outb(module_no + 1, usp->usp_iobase + 5); /* sends module number to card(1 .. 12) */ /* sends module number to card(1 .. 12) */
outb(module_no + 1, usp->usp_iobase + 5);
outb('V', usp->usp_iobase + 6); /* sends to module (V)erify command */ outb('V', usp->usp_iobase + 6); /* sends to module (V)erify command */
control = inb(usp->usp_iobase); /* get control register byte */ control = inb(usp->usp_iobase); /* get control register byte */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment