Skip to contentSkip to conversation

trivial: Remove 'and and' in descriptions

PATCH Applied Philippe Mathieu-Daudé 5 participants 8 messages Aug 11, 2020 – Sep 1, 2020

lore
Share & tools
lore
#0 lore raw

cover trivial: Remove 'and and' in descriptions

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(-)
Signature · 1 line
2.21.3
#1 lore raw

PATCH 1/3 hw/i2c: Fix typo in description

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

---
 include/hw/i2c/i2c.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/i2c/i2c.h +1 -1
index a9c030a512..f57808851e 100644
@@ -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
Signature · 1 line
2.21.3
Reviewed-by on v1 1/3
#2 lore raw

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

Quoted 4 lines · Philippe Mathieu-Daudé

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

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

Quoted 21 lines
---
 include/hw/i2c/i2c.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/i2c/i2c.h +1 -1
index a9c030a512..f57808851e 100644
@@ -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
Signature · 1 line
2.21.3
#3 lore raw

PATCH 2/3 util/qemu-timer: Fix typo in description

In reply to Philippe Mathieu-Daudé

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

---
 util/qemu-timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
util/qemu-timer.c +1 -1
index f62b4feecd..878d80fd5e 100644
@@ -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,
Signature · 1 line
2.21.3
#4 lore raw

PATCH 3/3 util/vfio-helpers: Fix typo in description

In reply to Philippe Mathieu-Daudé

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

---
 util/vfio-helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
util/vfio-helpers.c +2 -2
index e399e330e2..583bdfb36f 100644
@@ -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,
Signature · 1 line
2.21.3
Reviewed-by on the v1 series
#6 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 8 lines · Philippe Mathieu-Daudé <[email protected]> 于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:

Quoted 9 lines
 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

#7 lore raw
In reply to Philippe Mathieu-Daudé

Le 11/08/2020 à 17:16, Philippe Mathieu-Daudé a écrit :

Quoted 7 lines

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

Quoted 5 lines
 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