summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorJimmy Assarsson <extja@kvaser.com>2018-07-18 23:29:26 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2018-07-27 10:40:19 +0200
commit2b049c1500803081e26be46cf5a02d63a3eb13a4 (patch)
tree7190ab368f3ccbd516e3d960979e143d801b6c8e /drivers/net/can
parent6ba0b9294bca0fca727198a9660771d06823cf1a (diff)
downloadlinux-2b049c1500803081e26be46cf5a02d63a3eb13a4.tar.bz2
can: kvaser_usb: Fix typos
Fix some typos. Change can to CAN, when referring to Controller Area Network. Signed-off-by: Jimmy Assarsson <extja@kvaser.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/usb/kvaser_usb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 0559d139f988..07b91841140a 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -85,7 +85,7 @@ static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
/* Command header size */
#define CMD_HEADER_LEN 2
-/* Can message flags */
+/* CAN message flags */
#define MSG_FLAG_ERROR_FRAME BIT(0)
#define MSG_FLAG_OVERRUN BIT(1)
#define MSG_FLAG_NERR BIT(2)
@@ -95,7 +95,7 @@ static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
#define MSG_FLAG_TX_ACK BIT(6)
#define MSG_FLAG_TX_REQUEST BIT(7)
-/* Can states (M16C CxSTRH register) */
+/* CAN states (M16C CxSTRH register) */
#define M16C_STATE_BUS_RESET BIT(0)
#define M16C_STATE_BUS_ERROR BIT(4)
#define M16C_STATE_BUS_PASSIVE BIT(5)
@@ -866,14 +866,14 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev,
priv = dev->nets[es->channel];
stats = &priv->netdev->stats;
- /* Update all of the can interface's state and error counters before
+ /* Update all of the CAN interface's state and error counters before
* trying any memory allocation that can actually fail with -ENOMEM.
*
- * We send a temporary stack-allocated error can frame to
+ * We send a temporary stack-allocated error CAN frame to
* can_change_state() for the very same reason.
*
* TODO: Split can_change_state() responsibility between updating the
- * can interface's state and counters, and the setting up of can error
+ * CAN interface's state and counters, and the setting up of CAN error
* frame ID and data to userspace. Remove stack allocation afterwards.
*/
old_state = priv->can.state;
@@ -939,7 +939,7 @@ static void kvaser_usb_rx_error(const struct kvaser_usb *dev,
netif_rx(skb);
}
-/* For USBCAN, report error to userspace iff the channels's errors counter
+/* For USBCAN, report error to userspace if the channels's errors counter
* has changed, or we're the only channel seeing a bus error state.
*/
static void kvaser_usbcan_conditionally_rx_error(const struct kvaser_usb *dev,
@@ -1896,7 +1896,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev,
err = register_candev(netdev);
if (err) {
- dev_err(&dev->intf->dev, "Failed to register can device\n");
+ dev_err(&dev->intf->dev, "Failed to register CAN device\n");
free_candev(netdev);
dev->nets[channel] = NULL;
return err;