Commit f6a1a425 authored by Ethan Edwards's avatar Ethan Edwards Committed by Greg Kroah-Hartman

drivers: staging: comedi: fixed duplicate words from checkpatch

Fixed various different checkpatch duplicate word warnings, the TODO
file said to fix checkpatch warnings.
Signed-off-by: default avatarEthan Edwards <ethancarteredwards@gmail.com>
Link: https://lore.kernel.org/r/20200825002955.e3wvtwsoqqbc2cvl@archlaptop.localdomainSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dbd8c649
...@@ -680,7 +680,7 @@ struct comedi_rangeinfo { ...@@ -680,7 +680,7 @@ struct comedi_rangeinfo {
* value of 1 volt. * value of 1 volt.
* *
* The only defined flag value is %RF_EXTERNAL (%0x100), indicating that the * The only defined flag value is %RF_EXTERNAL (%0x100), indicating that the
* the range needs to be multiplied by an external reference. * range needs to be multiplied by an external reference.
*/ */
struct comedi_krange { struct comedi_krange {
int min; int min;
...@@ -970,7 +970,7 @@ enum i8254_mode { ...@@ -970,7 +970,7 @@ enum i8254_mode {
* major reasons exist why this caused major confusion for users: * major reasons exist why this caused major confusion for users:
* 1) The register values are _NOT_ in user documentation, but rather in * 1) The register values are _NOT_ in user documentation, but rather in
* arcane locations, such as a few register programming manuals that are * arcane locations, such as a few register programming manuals that are
* increasingly hard to find and the NI MHDDK (comments in in example code). * increasingly hard to find and the NI MHDDK (comments in example code).
* There is no one place to find the various valid values of the registers. * There is no one place to find the various valid values of the registers.
* 2) The register values are _NOT_ completely consistent. There is no way to * 2) The register values are _NOT_ completely consistent. There is no way to
* gain any sense of intuition of which values, or even enums one should use * gain any sense of intuition of which values, or even enums one should use
......
...@@ -627,7 +627,7 @@ extern const struct comedi_lrange range_unknown; ...@@ -627,7 +627,7 @@ extern const struct comedi_lrange range_unknown;
* @range: Array of &struct comedi_krange, one for each range. * @range: Array of &struct comedi_krange, one for each range.
* *
* Each element of @range[] describes the minimum and maximum physical range * Each element of @range[] describes the minimum and maximum physical range
* range and the type of units. Typically, the type of unit is %UNIT_volt * and the type of units. Typically, the type of unit is %UNIT_volt
* (i.e. volts) and the minimum and maximum are in millionths of a volt. * (i.e. volts) and the minimum and maximum are in millionths of a volt.
* There may also be a flag that indicates the minimum and maximum are merely * There may also be a flag that indicates the minimum and maximum are merely
* scale factors for an unknown, external reference. * scale factors for an unknown, external reference.
......
...@@ -544,7 +544,7 @@ static int apci1564_timer_insn_write(struct comedi_device *dev, ...@@ -544,7 +544,7 @@ static int apci1564_timer_insn_write(struct comedi_device *dev,
{ {
struct apci1564_private *devpriv = dev->private; struct apci1564_private *devpriv = dev->private;
/* just write the last last to the reload register */ /* just write the last to the reload register */
if (insn->n) { if (insn->n) {
unsigned int val = data[insn->n - 1]; unsigned int val = data[insn->n - 1];
...@@ -628,7 +628,7 @@ static int apci1564_counter_insn_write(struct comedi_device *dev, ...@@ -628,7 +628,7 @@ static int apci1564_counter_insn_write(struct comedi_device *dev,
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
unsigned long iobase = devpriv->counters + APCI1564_COUNTER(chan); unsigned long iobase = devpriv->counters + APCI1564_COUNTER(chan);
/* just write the last last to the reload register */ /* just write the last to the reload register */
if (insn->n) { if (insn->n) {
unsigned int val = data[insn->n - 1]; unsigned int val = data[insn->n - 1];
......
...@@ -248,7 +248,7 @@ EXPORT_SYMBOL_GPL(subdev_8255_mm_init); ...@@ -248,7 +248,7 @@ EXPORT_SYMBOL_GPL(subdev_8255_mm_init);
* subdev_8255_regbase - get offset of 8255 registers or call-back context * subdev_8255_regbase - get offset of 8255 registers or call-back context
* @s: comedi subdevice * @s: comedi subdevice
* *
* Returns the 'regbase' parameter that was previously passed to to * Returns the 'regbase' parameter that was previously passed to
* subdev_8255_init() or subdev_8255_mm_init() to set up the subdevice. * subdev_8255_init() or subdev_8255_mm_init() to set up the subdevice.
* Only valid if the subdevice was set up successfully. * Only valid if the subdevice was set up successfully.
*/ */
......
...@@ -286,7 +286,7 @@ int ni_tio_cmdtest(struct comedi_device *dev, ...@@ -286,7 +286,7 @@ int ni_tio_cmdtest(struct comedi_device *dev,
* This should be done, but we don't yet know the actual * This should be done, but we don't yet know the actual
* register values. These should be tested and then documented * register values. These should be tested and then documented
* in the ni_route_values/ni_*.csv files, with indication of * in the ni_route_values/ni_*.csv files, with indication of
* who/when/which/how these these were tested. * who/when/which/how these were tested.
* When at least a e/m/660x series have been tested, this code * When at least a e/m/660x series have been tested, this code
* should be uncommented: * should be uncommented:
* *
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
* *
* In the 48-channel version: * In the 48-channel version:
* *
* On subdev 0, the first 24 channels channels are edge-detect channels. * On subdev 0, the first 24 channels are edge-detect channels.
* *
* In the 96-channel board you have the following channels that can do edge * In the 96-channel board you have the following channels that can do edge
* detection: * detection:
......
...@@ -164,7 +164,7 @@ static int daqp_clear_events(struct comedi_device *dev, int loops) ...@@ -164,7 +164,7 @@ static int daqp_clear_events(struct comedi_device *dev, int loops)
/* /*
* Reset any pending interrupts (my card has a tendency to require * Reset any pending interrupts (my card has a tendency to require
* require multiple reads on the status register to achieve this). * multiple reads on the status register to achieve this).
*/ */
while (--loops) { while (--loops) {
status = inb(dev->iobase + DAQP_STATUS_REG); status = inb(dev->iobase + DAQP_STATUS_REG);
......
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