Fix common misspellings

Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Upstream commit: http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commitdiff;h=25985edcedea6396277003854657b5f3cb31a628

git-svn-id: svn://svn.berlios.de//socketcan/trunk@1239 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/Documentation/networking/can.txt b/kernel/2.6/Documentation/networking/can.txt
index 27bc2a687702acf816a8c05223519904f3b29eb0..e74386efef56bcece1dae45d9fbc9ea4e0735591 100644 (file)
--- a/kernel/2.6/Documentation/networking/can.txt
+++ b/kernel/2.6/Documentation/networking/can.txt
@@ -241,7 +241,7 @@ solution for a couple of reasons:
   the user application using the common CAN filter mechanisms. Inside
   this filter definition the (interested) type of errors may be
   selected. The reception of error frames is disabled by default.
-  The format of the CAN error frame is briefly decribed in the Linux
+  The format of the CAN error frame is briefly described in the Linux
   header file "include/linux/can/error.h".
 
 4. How to use Socket CAN

diff --git a/kernel/2.6/Documentation/networking/can/overview.txt b/kernel/2.6/Documentation/networking/can/overview.txt
index 6837172ab65d51327a8f614c8998ad851438376d..5e337587da483e63855e95c8248873d58a9228ea 100644 (file)
--- a/kernel/2.6/Documentation/networking/can/overview.txt
+++ b/kernel/2.6/Documentation/networking/can/overview.txt
@@ -213,7 +213,7 @@ This file contains:
   the user application using the common CAN filter mechanisms. Inside
   this filter definition the (interested) type of errors may be
   selected. The reception of error frames is disabled by default.
-  The format of the CAN error frame is briefly decribed in the Linux
+  The format of the CAN error frame is briefly described in the Linux
   header file "include/linux/can/error.h".
 
 4. Socket CAN resources

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index a28a01c451acff52c33f62be5300700a7539622e..ee5912cd3b35a443e5118bd547679a19fc41d361 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -258,7 +258,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
                out_be16(&regs->tx.idr3_2, can_id);
 
                can_id >>= 16;
-               /* EFF_FLAGS are inbetween the IDs :( */
+               /* EFF_FLAGS are between the IDs :( */
                can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0)
                         | MSCAN_EFF_FLAGS;
        } else {

diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.c b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
index 59183cb2067784af79f1f214984be09ee859bff4..5ffacbce91b4c6184d17bb397741e32d32a87672 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.c
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
@@ -447,7 +447,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
                        cf->data[3] = ecc & ECC_SEG;
                        break;
                }
-               /* Error occured during transmission? */
+               /* Error occurred during transmission? */
                if ((ecc & ECC_DIR) == 0)
                        cf->data[2] |= CAN_ERR_PROT_TX;
        }

diff --git a/kernel/2.6/drivers/net/can/softing/softing.h b/kernel/2.6/drivers/net/can/softing/softing.h
index 955867cc44ea9fccae07f4e222b7358d08a0d626..298338f05c1cbca17b4015c6a6d8ba03f92dff6b 100644 (file)
--- a/kernel/2.6/drivers/net/can/softing/softing.h
+++ b/kernel/2.6/drivers/net/can/softing/softing.h
@@ -27,7 +27,7 @@ struct softing_priv {
        struct softing *card;
        struct {
                int pending;
-               /* variables wich hold the circular buffer */
+               /* variables which hold the circular buffer */
                int echo_put;
                int echo_get;
        } tx;

diff --git a/kernel/2.6/drivers/net/can/softing/softing_main.c b/kernel/2.6/drivers/net/can/softing/softing_main.c
index 045b8fb075ef449676070071264b8d44d5313137..ce3e4453396585bf5b349536d5114342d1073644 100644 (file)
--- a/kernel/2.6/drivers/net/can/softing/softing_main.c
+++ b/kernel/2.6/drivers/net/can/softing/softing_main.c
@@ -224,7 +224,7 @@ static int softing_dev_svc_once(struct softing *card)
 
        cmd = *ptr++;
        if (cmd == 0xff) {
-               /*not quite usefull, probably the card has got out */
+               /*not quite useful, probably the card has got out */
                dev_alert(card->dev, "got cmd 0x%02x,"
                        " I suspect the card is lost\n", cmd);
        }

diff --git a/kernel/2.6/drivers/net/can/usb/ems_usb.c b/kernel/2.6/drivers/net/can/usb/ems_usb.c
index f3a8192f7285bafb50e64cc3d4b184e19e67ba86..7b9b6d2854af44e37f6e9e1d86b9de82eeadeb22 100644 (file)
--- a/kernel/2.6/drivers/net/can/usb/ems_usb.c
+++ b/kernel/2.6/drivers/net/can/usb/ems_usb.c
@@ -391,7 +391,7 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
                        break;
                }
 
-               /* Error occured during transmission? */
+               /* Error occurred during transmission? */
                if ((ecc & SJA1000_ECC_DIR) == 0)
                        cf->data[2] |= CAN_ERR_PROT_TX;
 

diff --git a/kernel/2.6/drivers/net/can/usb/esd_usb2.c b/kernel/2.6/drivers/net/can/usb/esd_usb2.c
index e06dae12c33c4afa67067238130f176712d7bf6f..080e285fafaa2eea2a5282f3ad5aa2979d25503e 100644 (file)
--- a/kernel/2.6/drivers/net/can/usb/esd_usb2.c
+++ b/kernel/2.6/drivers/net/can/usb/esd_usb2.c
@@ -283,7 +283,7 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
                                break;
                        }
 
-                       /* Error occured during transmission? */
+                       /* Error occurred during transmission? */
                        if (!(ecc & SJA1000_ECC_DIR))
                                cf->data[2] |= CAN_ERR_PROT_TX;
 

diff --git a/kernel/2.6/include/socketcan/can/error.h b/kernel/2.6/include/socketcan/can/error.h
index 44176c25cbfd9207c4d6cf049bc2c660bed1208d..eddea4b5d0fd64ca3e778dd0797b30bf6e8c6599 100644 (file)
--- a/kernel/2.6/include/socketcan/can/error.h
+++ b/kernel/2.6/include/socketcan/can/error.h
@@ -53,7 +53,7 @@
 #define CAN_ERR_PROT_BIT1        0x10 /* unable to send recessive bit */
 #define CAN_ERR_PROT_OVERLOAD    0x20 /* bus overload */
 #define CAN_ERR_PROT_ACTIVE      0x40 /* active error announcement */
-#define CAN_ERR_PROT_TX          0x80 /* error occured on transmission */
+#define CAN_ERR_PROT_TX          0x80 /* error occurred on transmission */
 
 /* error in CAN protocol (location) / data[3] */
 #define CAN_ERR_PROT_LOC_UNSPEC  0x00 /* unspecified */

diff --git a/kernel/2.6/include/socketcan/can/netlink.h b/kernel/2.6/include/socketcan/can/netlink.h
index 5ff322d6d1f8f87e7929f4851f2f841a0e85c097..cbe30410f52975855d9cffb7ed876d59156a3f6d 100644 (file)
--- a/kernel/2.6/include/socketcan/can/netlink.h
+++ b/kernel/2.6/include/socketcan/can/netlink.h
@@ -19,7 +19,7 @@
 /*
  * CAN bit-timing parameters
  *
- * For futher information, please read chapter "8 BIT TIMING
+ * For further information, please read chapter "8 BIT TIMING
  * REQUIREMENTS" of the "Bosch CAN Specification version 2.0"
  * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf.
  */

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index c1b0ed8bfcffe6a708623d2b8c57536afc11beea..6250c71a82f36e167a27ea08c09cbe72d6f072e3 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -497,7 +497,7 @@ static void bcm_tx_timeout_tsklet(unsigned long data)
 }
 
 /*
- * bcm_tx_timeout_handler - performes cyclic CAN frame transmissions
+ * bcm_tx_timeout_handler - performs cyclic CAN frame transmissions
  */
 static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)
 {