From: hartkopp Date: Tue, 19 Apr 2011 14:15:21 +0000 (+0000) Subject: Fix common misspellings X-Git-Url: https://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/baca69fc46cd1d9e9d8ba17ff1d8854b1a9f3907 Fix common misspellings Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi 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 27bc2a6..e74386e 100644 --- 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 6837172..5e33758 100644 --- 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 a28a01c..ee5912c 100644 --- 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(®s->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 59183cb..5ffacbc 100644 --- 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 955867c..298338f 100644 --- 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 045b8fb..ce3e445 100644 --- 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 f3a8192..7b9b6d2 100644 --- 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 e06dae1..080e285 100644 --- 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 44176c2..eddea4b 100644 --- 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 5ff322d..cbe3041 100644 --- 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 c1b0ed8..6250c71 100644 --- 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) {