Fix spelling of "occurred".

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/board/bf533-ezkit/flash.c b/board/bf533-ezkit/flash.c
index 3180a76fa649c5b27dcce65b8ee97e8b12acdd0a..a7b3519d95057b68f8fbe23dc5203f3809af585e 100644 (file)
--- a/board/bf533-ezkit/flash.c
+++ b/board/bf533-ezkit/flash.c
@@ -320,7 +320,7 @@ int poll_toggle_bit(long lOffset)
                }
                timeout--;
        }
-       printf("Time out occured \n");
+       printf("Time out occurred \n");
        if (timeout < 0)
                return FLASH_FAIL;
 }

diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c
index 7c7690ff555be6f0319d18ec4c7347fcf38eddff..1bd2fbfc58513adbb96bebd33bd4ca601e34add5 100644 (file)
--- a/board/mpl/pip405/pip405.c
+++ b/board/mpl/pip405/pip405.c
@@ -777,7 +777,7 @@ void print_pip405_info (void)
                        ((sysman & 0x10) == 0x10) ? "" : "not ");
        printf ("INIT asserts %sINT1# (NMI)\n",
                        ((sysman & 0x20) == 0x20) ? "" : "not ");
-       printf ("INIT occured %d\n", (sysman >> 6) & 0x1);
+       printf ("INIT occurred %d\n", (sysman >> 6) & 0x1);
        printf ("SER1 is routed to %s\n",
                        ((flashcom & 0x1) == 0x1) ? "RS485" : "RS232");
        printf ("COM2 is routed to %s\n",

diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index 9d2d5a8fa986df4d1e73c2bd124e37444e8d5a42..dc22ee4024804a84537eff7a75ea1dad2d36c261 100644 (file)
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -72,7 +72,7 @@ static int spi_transmit(unsigned char data)
        spi->dr = data;
        /* wait for SPI transmission completed */
        while (!(spi->sr & 0x80)) {
-               if (spi->sr & 0x40) {   /* if write collision occured */
+               if (spi->sr & 0x40) {   /* if write collision occurred */
                        int dummy;
 
                        /* do dummy read to clear status register */

diff --git a/cmd/fdc.c b/cmd/fdc.c
index 058ae89a38765834718dc058aebee906a29adc16..d2281abbda90e92dee738c709e11027a36f202eb 100644 (file)
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -189,7 +189,7 @@ int wait_for_fdc_int(void)
        while((read_fdc_reg(FDC_SRA)&0x80)==0) {
                timeout--;
                udelay(10);
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return false;
        }
        return true;
@@ -205,7 +205,7 @@ int read_fdc_byte(void)
                /* direction out and ready */
                udelay(10);
                timeout--;
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return -1;
        }
        return read_fdc_reg(FDC_FIFO);
@@ -235,7 +235,7 @@ int write_fdc_byte(unsigned char val)
                timeout--;
                udelay(10);
                fdc_need_more_output();
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return false;
        }
        write_fdc_reg(FDC_FIFO,val);
@@ -395,7 +395,7 @@ int fdc_terminate(FDC_COMMAND_STRUCT *pCMD)
        int i;
        for(i=0;i<100;i++)
                udelay(500); /* wait 500usec for fifo overrun */
-       while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occured */
+       while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occurred */
        for(i=0;i<7;i++) {
                pCMD->result[i]=(unsigned char)read_fdc_byte();
        }

diff --git a/common/kgdb.c b/common/kgdb.c
index d357463695f3c0cc85dd2b88ce2504a7312dd97a..daf53bed7a9630133c659e0384307c480a8292b6 100644 (file)
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -326,7 +326,7 @@ handle_exception (struct pt_regs *regs)
                return (0);
        }
 
-       /* probably should check which exception occured as well */
+       /* probably should check which exception occurred as well */
        if (longjmp_on_fault) {
                longjmp_on_fault = 0;
                kgdb_longjmp(error_jmp_buf, KGDBERR_MEMFAULT);

diff --git a/common/usb_hub.c b/common/usb_hub.c
index e6a2cdb6f86de458a828f2d220263aa7d6cf6df2..4f59802d591da96c9e566740ff78e07e65a5bb47 100644 (file)
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -475,7 +475,7 @@ static int usb_scan_port(struct usb_device_scan *usb_scan)
                        return 0;
 
                /* Otherwise the device will get removed */
-               printf("Port %d over-current occured %d times\n", i + 1,
+               printf("Port %d over-current occurred %d times\n", i + 1,
                       hub->overcurrent_count[i]);
        }
 

diff --git a/drivers/ddr/marvell/a38x/ddr3_init.h b/drivers/ddr/marvell/a38x/ddr3_init.h
index cb3fb24416e243b18fa1aa66a2a873ff3393c056..8cb08864c292bb43e0ff113643517fda44ab52b3 100644 (file)
--- a/drivers/ddr/marvell/a38x/ddr3_init.h
+++ b/drivers/ddr/marvell/a38x/ddr3_init.h
@@ -120,7 +120,7 @@
 #define MV_NO_RESOURCE (0x13)  /* Resource not available (memory ...)   */
 #define MV_FULL                (0x14)  /* Item is full (Queue or table etc...)  */
 #define MV_EMPTY       (0x15)  /* Item is empty (Queue or table etc...) */
-#define MV_INIT_ERROR  (0x16)  /* Error occured while INIT process      */
+#define MV_INIT_ERROR  (0x16)  /* Error occurred while INIT process      */
 #define MV_HW_ERROR    (0x17)  /* Hardware error                        */
 #define MV_TX_ERROR    (0x18)  /* Transmit operation not succeeded      */
 #define MV_RX_ERROR    (0x19)  /* Recieve operation not succeeded       */

diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.h b/drivers/ddr/marvell/axp/ddr3_hw_training.h
index cffa7c4ff95d2f3c768adf551a65638b81a3303e..343a6b6672f82e4bb0e830d6e604c5b4b5c50b3c 100644 (file)
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.h
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.h
@@ -41,7 +41,7 @@
 #define MV_NO_RESOURCE (0x13)  /* Resource not available (memory ...)   */
 #define MV_FULL                (0x14)  /* Item is full (Queue or table etc...)  */
 #define MV_EMPTY       (0x15)  /* Item is empty (Queue or table etc...) */
-#define MV_INIT_ERROR  (0x16)  /* Error occured while INIT process      */
+#define MV_INIT_ERROR  (0x16)  /* Error occurred while INIT process      */
 #define MV_HW_ERROR    (0x17)  /* Hardware error                        */
 #define MV_TX_ERROR    (0x18)  /* Transmit operation not succeeded      */
 #define MV_RX_ERROR    (0x19)  /* Recieve operation not succeeded       */

diff --git a/drivers/i2c/kona_i2c.c b/drivers/i2c/kona_i2c.c
index 9af496bbb1cdbd8454c5fd927bfda5b1bf44b53e..11f29d926d4e4c1d290601b3eb332edbd98977dc 100644 (file)
--- a/drivers/i2c/kona_i2c.c
+++ b/drivers/i2c/kona_i2c.c
@@ -381,7 +381,7 @@ static int bcm_kona_i2c_write_fifo_single(struct bcm_kona_i2c_dev *dev,
                return -EREMOTEIO;
        }
 
-       /* Check if a timeout occured */
+       /* Check if a timeout occurred */
        if (!time_left) {
                printf("completion timed out\n");
                return -EREMOTEIO;

diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index 4814fa202a65b0274a4f4f8f82409edb4a004cd3..6a45d28a72d2d02e7d9ca68a372db1f967df7175 100644 (file)
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -106,7 +106,7 @@ static uint32_t gen_true_ecc(uint8_t *ecc_buf)
 
 /*
  * omap_correct_data - Compares the ecc read from nand spare area with ECC
- * registers values and corrects one bit error if it has occured
+ * registers values and corrects one bit error if it has occurred
  * Further details can be had from OMAP TRM and the following selected links:
  * http://en.wikipedia.org/wiki/Hamming_code
  * http://www.cs.utexas.edu/users/plaxton/c/337/05f/slides/ErrorCorrection-4.pdf
@@ -479,7 +479,7 @@ static void omap_reverse_list(u8 *list, unsigned int length)
 
 /*
  * omap_correct_data_bch - Compares the ecc read from nand spare area
- * with ECC registers values and corrects one bit error if it has occured
+ * with ECC registers values and corrects one bit error if it has occurred
  *
  * @mtd:       MTD device structure
  * @dat:       page data

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 3c30f42b429dbe33aa9f09626e3b332e6cde7a02..bc52ed35ccbb9ce863c2edc1e578be14511a40cc 100644 (file)
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -1726,7 +1726,7 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
        mtdcr (MAL0_RXDEIR, 0x80000000);
 
 #ifdef INFO_4XX_ENET
-       printf("\nMAL error occured.... ISR = %lx UIC = = %lx   MAL_DEF = %lx  MAL_ERR= %lx\n",
+       printf("\nMAL error occurred.... ISR = %lx UIC = = %lx  MAL_DEF = %lx  MAL_ERR= %lx\n",
               isr, uic, maldef, mal_errr);
 #endif
 
@@ -1740,7 +1740,7 @@ static void emac_err (struct eth_device *dev, unsigned long isr)
 {
        EMAC_4XX_HW_PST hw_p = dev->priv;
 
-       printf ("EMAC%d error occured.... ISR = %lx\n", hw_p->devnum, isr);
+       printf ("EMAC%d error occurred.... ISR = %lx\n", hw_p->devnum, isr);
        out_be32((void *)EMAC0_ISR + hw_p->hw_addr, isr);
 }
 

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 59ea11cd6a073587b85f3d9f132f82833dfe478c..611eabb5460f180818f2dc0de297a1f0d1671994 100644 (file)
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -381,7 +381,7 @@ static int enc_phy_link_wait(enc_dev_t *enc)
                udelay(1000);
        }
 
-       /* timeout occured */
+       /* timeout occurred */
        printf("%s: link down\n", enc->dev->name);
        return 1;
 }

diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 71d133cc8f10cd7dfec686336225393abfa5a2ca..67bf140a37ada2daf2b067d86efa2560252292f5 100644 (file)
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -582,7 +582,7 @@ dp83902a_Overflow(void)
        /*
         * Read in as many packets as we can and acknowledge any and receive
         * interrupts. Since the buffer has overflowed, a receive event of
-        * some kind will have occured.
+        * some kind will have occurred.
         */
        dp83902a_RxEvent();
        DP_OUT(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE);
@@ -592,7 +592,7 @@ dp83902a_Overflow(void)
        DP_OUT(base, DP_TCR, DP_TCR_NORMAL);
 
        /*
-        * If a transmit command was issued, but no transmit event has occured,
+        * If a transmit command was issued, but no transmit event has occurred,
         * restart it here.
         */
        DP_IN(base, DP_ISR, isr);

diff --git a/drivers/usb/gadget/mpc8xx_udc.c b/drivers/usb/gadget/mpc8xx_udc.c
index b3e178abefb457cd801ee78994b54c4dd95b51b7..ad5ea7a6b86007971f1616feca88e1962d4be22a 100644 (file)
--- a/drivers/usb/gadget/mpc8xx_udc.c
+++ b/drivers/usb/gadget/mpc8xx_udc.c
@@ -170,7 +170,7 @@ int udc_init (void)
 
 /* udc_irq
  *
- * Poll for whatever events may have occured
+ * Poll for whatever events may have occurred
  */
 void udc_irq (void)
 {

diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index 9a3b61aa557b8cea2c8ff996dfc6aef8aebe60a7..49479368d215279e902465ea34d861e17c3c1bbf 100644 (file)
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -73,9 +73,9 @@ static void write_toggle(struct usb_device *dev, u8 ep, u8 dir_out)
 }
 
 /*
- * This function checks if RxStall has occured on the endpoint. If a RxStall
- * has occured, the RxStall is cleared and 1 is returned. If RxStall has
- * not occured, 0 is returned.
+ * This function checks if RxStall has occurred on the endpoint. If a RxStall
+ * has occurred, the RxStall is cleared and 1 is returned. If RxStall has
+ * not occurred, 0 is returned.
  */
 static u8 check_stall(u8 ep, u8 dir_out)
 {

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 652cf3bab707fbf952f597489cfb516031ef59c8..fcf331b79f4b350b40cb73deac320b327b6d91c8 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -388,14 +388,14 @@ struct fb_cursor_user {
 #define FB_EVENT_GET_CONSOLE_MAP       0x07
 /*     CONSOLE-SPECIFIC: set console to framebuffer mapping */
 #define FB_EVENT_SET_CONSOLE_MAP       0x08
-/*     A hardware display blank change occured */
+/*     A hardware display blank change occurred */
 #define FB_EVENT_BLANK                 0x09
 /*     Private modelist is to be replaced */
 #define FB_EVENT_NEW_MODELIST          0x0A
 /*     The resolution of the passed in fb_info about to change and
        all vc's should be changed         */
 #define FB_EVENT_MODE_CHANGE_ALL       0x0B
-/*     A software display blank change occured */
+/*     A software display blank change occurred */
 #define FB_EVENT_CONBLANK              0x0C
 /*     Get drawing requirements        */
 #define FB_EVENT_GET_REQ               0x0D

diff --git a/include/test/ut.h b/include/test/ut.h
index da7c1a9d265b4820582315ebbe04eddfb1172c6b..85434d785a835a76575f033b5f81b371610102c7 100644 (file)
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -17,9 +17,9 @@ struct unit_test_state;
  * ut_fail() - Record failure of a unit test
  *
  * @uts: Test state
- * @fname: Filename where the error occured
- * @line: Line number where the error occured
- * @func: Function name where the error occured
+ * @fname: Filename where the error occurred
+ * @line: Line number where the error occurred
+ * @func: Function name where the error occurred
  * @cond: The condition that failed
  */
 void ut_fail(struct unit_test_state *uts, const char *fname, int line,
@@ -29,9 +29,9 @@ void ut_fail(struct unit_test_state *uts, const char *fname, int line,
  * ut_failf() - Record failure of a unit test
  *
  * @uts: Test state
- * @fname: Filename where the error occured
- * @line: Line number where the error occured
- * @func: Function name where the error occured
+ * @fname: Filename where the error occurred
+ * @line: Line number where the error occurred
+ * @func: Function name where the error occurred
  * @cond: The condition that failed
  * @fmt: printf() format string for the error, followed by args
  */

diff --git a/include/usbdevice.h b/include/usbdevice.h
index da5af6efe4c0d827c8cccaac572436b503ff8920..f27e17f124a3113f988e9f43609424c72d1b5374 100644 (file)
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -438,7 +438,7 @@ typedef enum usb_device_event {
        DEVICE_HUB_RESET,       /* bi  - bus has been unplugged */
        DEVICE_DESTROY,         /* bi  - device instance should be destroyed */
 
-       DEVICE_HOTPLUG,         /* bi  - a hotplug event has occured */
+       DEVICE_HOTPLUG,         /* bi  - a hotplug event has occurred */
 
        DEVICE_FUNCTION_PRIVATE,        /* function - private */