History

s/retreiv/retriev/g

As everyone knows, the rule is: "i before e.. um.. always."

Matt Mackall committed 20 years ago

Commit 4a4efbd1 parent 7a1119b7 files · +16 −16Browse files

Unified · Split

7 files
  1. drivers/char/n_hdlc.c +1 −1
  2. drivers/net/tlan.c +2 −2
  3. drivers/usb/serial/ftdi_sio.h +1 −1
  4. drivers/video/aty/radeon_base.c +8 −8
  5. fs/reiserfs/xattr.c +2 −2
  6. net/irda/iriap.c +1 −1
  7. scripts/kconfig/util.c +1 −1
drivers/char/n_hdlc.c+1−1
@@ -562,7 +562,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, · 561 unmodified lines
562562 } /* end of n_hdlc_tty_receive() */
563563
564564 /**
565− * n_hdlc_tty_read - Called to retreive one frame of data (if available)
565+ * n_hdlc_tty_read - Called to retrieve one frame of data (if available)
566566 * @tty - pointer to tty instance data
567567 * @file - pointer to open file object
568568 * @buf - pointer to returned data buffer
drivers/net/tlan.c+2−2
@@ -2865,11 +2865,11 @@ void TLan_PhyMonitor( struct net_device *dev ) · 2864 unmodified lines
28652865 * for this device.
28662866 * phy The address of the PHY to be queried.
28672867 * reg The register whose contents are to be
2868− * retreived.
2868+ * retrieved.
28692869 * val A pointer to a variable to store the
28702870 * retrieved value.
28712871 *
2872− * This function uses the TLAN's MII bus to retreive the contents
2872+ * This function uses the TLAN's MII bus to retrieve the contents
28732873 * of a given register on a PHY. It sends the appropriate info
28742874 * and then reads the 16-bit register value from the MII bus via
28752875 * the TLAN SIO register.
drivers/usb/serial/ftdi_sio.h+1−1
@@ -714,7 +714,7 @@ typedef enum { · 713 unmodified lines
714714 */
715715
716716 /* FTDI_SIO_GET_MODEM_STATUS */
717−/* Retreive the current value of the modem status register */
717+/* Retrieve the current value of the modem status register */
718718
719719 #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0
720720 #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS
drivers/video/aty/radeon_base.c+8−8
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo) · 593 unmodified lines
594594 }
595595
596596 /*
597− * Retreive PLL infos by different means (BIOS, Open Firmware, register probing...)
597+ * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
598598 */
599599 static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
600600 {
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) · 59 unmodified lines
660660
661661 #ifdef CONFIG_PPC_OF
662662 /*
663− * Retreive PLL infos from Open Firmware first
663+ * Retrieve PLL infos from Open Firmware first
664664 */
665665 if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
666− printk(KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n");
666+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n");
667667 goto found;
668668 }
669669 #endif /* CONFIG_PPC_OF */
670670
671671 /*
672672 * Check out if we have an X86 which gave us some PLL informations
673− * and if yes, retreive them
673+ * and if yes, retrieve them
674674 */
675675 if (!force_measure_pll && rinfo->bios_seg) {
676676 u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) · 5 unmodified lines
682682 rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
683683 rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
684684
685− printk(KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n");
685+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n");
686686 goto found;
687687 }
688688
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) · 2 unmodified lines
691691 * probe them
692692 */
693693 if (radeon_probe_pll_params(rinfo) == 0) {
694− printk(KERN_INFO "radeonfb: Retreived PLL infos from registers\n");
694+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from registers\n");
695695 goto found;
696696 }
697697
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) · 4 unmodified lines
702702
703703 found:
704704 /*
705− * Some methods fail to retreive SCLK and MCLK values, we apply default
705+ * Some methods fail to retrieve SCLK and MCLK values, we apply default
706706 * settings in this case (200Mhz). If that really happne often, we could
707707 * fetch from registers instead...
708708 */
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev, · 1684 unmodified lines
23932393 rinfo->mapped_vram/1024);
23942394
23952395 /*
2396− * Map the BIOS ROM if any and retreive PLL parameters from
2396+ * Map the BIOS ROM if any and retrieve PLL parameters from
23972397 * the BIOS. We skip that on mobility chips as the real panel
23982398 * values we need aren't in the ROM but in the BIOS image in
23992399 * memory. This is definitely not the best meacnism though,
fs/reiserfs/xattr.c+2−2
@@ -115,8 +115,8 @@ static struct dentry *__get_xa_root(struct super_block *s) · 114 unmodified lines
115115 }
116116
117117 /* Returns the dentry (or NULL) referring to the root of the extended
118− * attribute directory tree. If it has already been retreived, it is used.
119− * Otherwise, we attempt to retreive it from disk. It may also return
118+ * attribute directory tree. If it has already been retrieved, it is used.
119+ * Otherwise, we attempt to retrieve it from disk. It may also return
120120 * a pointer-encoded error.
121121 */
122122 static inline struct dentry *get_xa_root(struct super_block *s)
net/irda/iriap.c+1−1
@@ -364,7 +364,7 @@ static void iriap_disconnect_request(struct iriap_cb *self) · 363 unmodified lines
364364 /*
365365 * Function iriap_getvaluebyclass (addr, name, attr)
366366 *
367− * Retreive all values from attribute in all objects with given class
367+ * Retrieve all values from attribute in all objects with given class
368368 * name
369369 */
370370 int iriap_getvaluebyclass_request(struct iriap_cb *self,
scripts/kconfig/util.c+1−1
@@ -101,7 +101,7 @@ void str_printf(struct gstr *gs, const char *fmt, ...) · 100 unmodified lines
101101 va_end(ap);
102102 }
103103
104−/* Retreive value of growable string */
104+/* Retrieve value of growable string */
105105 const char *str_get(struct gstr *gs)
106106 {
107107 return gs->s;