[PATCH-for-5.2 0/3] trivial: Remove 'and and' in descriptions

[PATCH-for-5.2 0/3] trivial: Remove 'and and' in descriptions

[Philippe Mathieu-Daudé]

Remove duplicated 'and' in comments.

Philippe Mathieu-Daudé (3):
  hw/i2c: Fix typo in description
  util/qemu-timer: Fix typo in description
  util/vfio-helpers: Fix typo in description

 include/hw/i2c/i2c.h | 2 +-
 util/qemu-timer.c    | 2 +-
 util/vfio-helpers.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.21.3

[PATCH-for-5.2 1/3] hw/i2c: Fix typo in description

[Philippe Mathieu-Daudé]

Remove the second 'and' introduced in commit 73d5f22ecb
("hw/i2c: Document the I2C qdev helpers").

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 include/hw/i2c/i2c.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
index a9c030a512..f57808851e 100644
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@@ -102,7 +102,7 @@ I2CSlave *i2c_slave_new(const char *name, uint8_t addr);
 I2CSlave *i2c_slave_create_simple(I2CBus *bus, const char *name, uint8_t addr);
 
 /**
- * Realize and and drop a reference an I2C slave device
+ * Realize and drop a reference an I2C slave device
  * @dev: I2C slave device to realize
  * @bus: I2C bus to put it on
  * @addr: I2C address of the slave on the bus
-- 
2.21.3

[PATCH-for-5.2 2/3] util/qemu-timer: Fix typo in description

[Philippe Mathieu-Daudé]

Remove the second 'and' introduced in commit e81f86790f ("qemu-timer:
avoid checkpoints for virtual clock timers in external subsystems").

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 util/qemu-timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index f62b4feecd..878d80fd5e 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -530,7 +530,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list)
     }
 
     /*
-     * Extract expired timers from active timers list and and process them.
+     * Extract expired timers from active timers list and process them.
      *
      * In rr mode we need "filtered" checkpointing for virtual clock.  The
      * checkpoint must be recorded/replayed before processing any non-EXTERNAL timer,
-- 
2.21.3

[PATCH-for-5.2 3/3] util/vfio-helpers: Fix typo in description

[Philippe Mathieu-Daudé]

Remove the second 'and' introduced in commit 418026ca43
("util: Introduce vfio helpers").

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 util/vfio-helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index e399e330e2..583bdfb36f 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -173,7 +173,7 @@ void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar,
 }
 
 /**
- * Initialize device IRQ with @irq_type and and register an event notifier.
+ * Initialize device IRQ with @irq_type and register an event notifier.
  */
 int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
                            int irq_type, Error **errp)
@@ -505,7 +505,7 @@ static IOVAMapping *qemu_vfio_find_mapping(QEMUVFIOState *s, void *host,
 }
 
 /**
- * Allocate IOVA and and create a new mapping record and insert it in @s.
+ * Allocate IOVA and create a new mapping record and insert it in @s.
  */
 static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,
                                           void *host, size_t size,
-- 
2.21.3

Re: [PATCH-for-5.2 0/3] trivial: Remove 'and and' in descriptions

[Peter Maydell]

On Tue, 11 Aug 2020 at 16:18, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Remove duplicated 'and' in comments.
>
> Philippe Mathieu-Daudé (3):
>   hw/i2c: Fix typo in description
>   util/qemu-timer: Fix typo in description
>   util/vfio-helpers: Fix typo in description

Series:

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH-for-5.2 0/3] trivial: Remove 'and and' in descriptions

[Li Qiang]

Philippe Mathieu-Daudé <philmd@redhat.com> 于2020年8月11日周二 下午11:17写道：
>
> Remove duplicated 'and' in comments.
>
> Philippe Mathieu-Daudé (3):
>   hw/i2c: Fix typo in description
>   util/qemu-timer: Fix typo in description
>   util/vfio-helpers: Fix typo in description
>

For this series:

Reviewed-by: Li Qiang <liq3ea@gmail.com>

>  include/hw/i2c/i2c.h | 2 +-
>  util/qemu-timer.c    | 2 +-
>  util/vfio-helpers.c  | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> --
> 2.21.3
>
>

Re: [PATCH-for-5.2 1/3] hw/i2c: Fix typo in description

[Corey Minyard]

On Tue, Aug 11, 2020 at 05:16:41PM +0200, Philippe Mathieu-Daudé wrote:
> Remove the second 'and' introduced in commit 73d5f22ecb
> ("hw/i2c: Document the I2C qdev helpers").
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Well, it seems rather obvious that this is correct :), so:

Reviewed-by: Corey Minyard <cminyard@mvista.com>

> ---
>  include/hw/i2c/i2c.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
> index a9c030a512..f57808851e 100644
> --- a/include/hw/i2c/i2c.h
> +++ b/include/hw/i2c/i2c.h
> @@ -102,7 +102,7 @@ I2CSlave *i2c_slave_new(const char *name, uint8_t addr);
>  I2CSlave *i2c_slave_create_simple(I2CBus *bus, const char *name, uint8_t addr);
>  
>  /**
> - * Realize and and drop a reference an I2C slave device
> + * Realize and drop a reference an I2C slave device
>   * @dev: I2C slave device to realize
>   * @bus: I2C bus to put it on
>   * @addr: I2C address of the slave on the bus
> -- 
> 2.21.3
> 
> 

Re: [PATCH-for-5.2 0/3] trivial: Remove 'and and' in descriptions

[Laurent Vivier]

Le 11/08/2020 à 17:16, Philippe Mathieu-Daudé a écrit :
> Remove duplicated 'and' in comments.
> 
> Philippe Mathieu-Daudé (3):
>   hw/i2c: Fix typo in description
>   util/qemu-timer: Fix typo in description
>   util/vfio-helpers: Fix typo in description
> 
>  include/hw/i2c/i2c.h | 2 +-
>  util/qemu-timer.c    | 2 +-
>  util/vfio-helpers.c  | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 

Applied to my trivial-patches branch.

Thanks,
Laurent