Fixed various different checkpatch duplicate word warnings, the TODO
file said to fix checkpatch warnings.
My old email didn't CC the mailing lists, ignore the old one, sorry.
Signed-off-by: Ethan Edwards <[email protected]>
---
drivers/staging/comedi/comedi.h | 4 ++--
drivers/staging/comedi/comedidev.h | 2 +-
drivers/staging/comedi/drivers/addi_apci_1564.c | 4 ++--
drivers/staging/comedi/drivers/comedi_8255.c | 2 +-
drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +-
drivers/staging/comedi/drivers/pcmuio.c | 2 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 09a940066c0e..b5d00a006dbb 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -680,7 +680,7 @@ struct comedi_rangeinfo {
* value of 1 volt.
*
* 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 {
int min;
@@ -970,7 +970,7 @@ enum i8254_mode {
* major reasons exist why this caused major confusion for users:
* 1) The register values are _NOT_ in user documentation, but rather in
* 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.
* 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
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 0dff1ac057cd..0e1b95ef9a4d 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -627,7 +627,7 @@ extern const struct comedi_lrange range_unknown;
* @range: Array of &struct comedi_krange, one for each 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.
* There may also be a flag that indicates the minimum and maximum are merely
* scale factors for an unknown, external reference.
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index fadefcb5c237..06fc7ed96200 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -544,7 +544,7 @@ static int apci1564_timer_insn_write(struct comedi_device *dev,
{
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) {
unsigned int val = data[insn->n - 1];
@@ -628,7 +628,7 @@ static int apci1564_counter_insn_write(struct comedi_device *dev,
unsigned int chan = CR_CHAN(insn->chanspec);
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) {
unsigned int val = data[insn->n - 1];
diff --git a/drivers/staging/comedi/drivers/comedi_8255.c b/drivers/staging/comedi/drivers/comedi_8255.c
index 3298725b9ba5..b7ca465933ee 100644
--- a/drivers/staging/comedi/drivers/comedi_8255.c
+++ b/drivers/staging/comedi/drivers/comedi_8255.c
@@ -248,7 +248,7 @@ EXPORT_SYMBOL_GPL(subdev_8255_mm_init);
* subdev_8255_regbase - get offset of 8255 registers or call-back context
* @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.
* Only valid if the subdevice was set up successfully.
*/
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 2a9f7e9821a7..ab6d9e8269f3 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -286,7 +286,7 @@ int ni_tio_cmdtest(struct comedi_device *dev,
* This should be done, but we don't yet know the actual
* register values. These should be tested and then documented
* 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
* should be uncommented:
*
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 7e1fc6ffb48c..b299d648a0eb 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -48,7 +48,7 @@
*
* 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
* detection:
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 1b1efa4d31f6..fe4408ebf6b3 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -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
- * require multiple reads on the status register to achieve this).
+ * multiple reads on the status register to achieve this).
*/
while (--loops) {
status = inb(dev->iobase + DAQP_STATUS_REG);
--
2.28.0
On 22/08/2020 21:21, Ethan Edwards wrote:
> Fixed various different checkpatch duplicate word warnings, the TODO
> file said to fix checkpatch warnings.
>
> My old email didn't CC the mailing lists, ignore the old one, sorry.
Everything above the '---' line ends up in the git commit message
(unless edited out manually, and Greg hates that). The comment about
CC'ing email lists doesn't belong in the commit message. Could you send
a '[PATCH v2]' with that line edited out and place a description of the
v2 changes just below the '---' line?
Thanks.
>
> Signed-off-by: Ethan Edwards <[email protected]>
> ---
> drivers/staging/comedi/comedi.h | 4 ++--
> drivers/staging/comedi/comedidev.h | 2 +-
> drivers/staging/comedi/drivers/addi_apci_1564.c | 4 ++--
> drivers/staging/comedi/drivers/comedi_8255.c | 2 +-
> drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +-
> drivers/staging/comedi/drivers/pcmuio.c | 2 +-
> drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +-
> 7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
> index 09a940066c0e..b5d00a006dbb 100644
> --- a/drivers/staging/comedi/comedi.h
> +++ b/drivers/staging/comedi/comedi.h
> @@ -680,7 +680,7 @@ struct comedi_rangeinfo {
> * value of 1 volt.
> *
> * 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 {
> int min;
> @@ -970,7 +970,7 @@ enum i8254_mode {
> * major reasons exist why this caused major confusion for users:
> * 1) The register values are _NOT_ in user documentation, but rather in
> * 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.
> * 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
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 0dff1ac057cd..0e1b95ef9a4d 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -627,7 +627,7 @@ extern const struct comedi_lrange range_unknown;
> * @range: Array of &struct comedi_krange, one for each 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.
> * There may also be a flag that indicates the minimum and maximum are merely
> * scale factors for an unknown, external reference.
> diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
> index fadefcb5c237..06fc7ed96200 100644
> --- a/drivers/staging/comedi/drivers/addi_apci_1564.c
> +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
> @@ -544,7 +544,7 @@ static int apci1564_timer_insn_write(struct comedi_device *dev,
> {
> 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) {
> unsigned int val = data[insn->n - 1];
>
> @@ -628,7 +628,7 @@ static int apci1564_counter_insn_write(struct comedi_device *dev,
> unsigned int chan = CR_CHAN(insn->chanspec);
> 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) {
> unsigned int val = data[insn->n - 1];
>
> diff --git a/drivers/staging/comedi/drivers/comedi_8255.c b/drivers/staging/comedi/drivers/comedi_8255.c
> index 3298725b9ba5..b7ca465933ee 100644
> --- a/drivers/staging/comedi/drivers/comedi_8255.c
> +++ b/drivers/staging/comedi/drivers/comedi_8255.c
> @@ -248,7 +248,7 @@ EXPORT_SYMBOL_GPL(subdev_8255_mm_init);
> * subdev_8255_regbase - get offset of 8255 registers or call-back context
> * @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.
> * Only valid if the subdevice was set up successfully.
> */
> diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
> index 2a9f7e9821a7..ab6d9e8269f3 100644
> --- a/drivers/staging/comedi/drivers/ni_tiocmd.c
> +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
> @@ -286,7 +286,7 @@ int ni_tio_cmdtest(struct comedi_device *dev,
> * This should be done, but we don't yet know the actual
> * register values. These should be tested and then documented
> * 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
> * should be uncommented:
> *
> diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
> index 7e1fc6ffb48c..b299d648a0eb 100644
> --- a/drivers/staging/comedi/drivers/pcmuio.c
> +++ b/drivers/staging/comedi/drivers/pcmuio.c
> @@ -48,7 +48,7 @@
> *
> * 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
> * detection:
> diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> index 1b1efa4d31f6..fe4408ebf6b3 100644
> --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
> @@ -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
> - * require multiple reads on the status register to achieve this).
> + * multiple reads on the status register to achieve this).
> */
> while (--loops) {
> status = inb(dev->iobase + DAQP_STATUS_REG);
>
--
-=( Ian Abbott <[email protected]> || Web: http://www.mev.co.uk )=-
-=( MEV Ltd. is a company registered in England & Wales. )=-
-=( Registered number: 02862268. Registered address: )=-
-=( 15 West Park Road, Bramhall, STOCKPORT, SK7 3JZ, UK. )=-