projects
/
elmcan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
13e6f18
)
Use netdev_* prints throughout
author
norly
<ny-git@enpas.org>
Wed, 23 Jan 2019 16:04:12 +0000
(17:04 +0100)
committer
norly
<ny-git@enpas.org>
Wed, 30 Jan 2019 22:47:28 +0000
(23:47 +0100)
module/elmcan.c
patch
|
blob
|
history
diff --git
a/module/elmcan.c
b/module/elmcan.c
index 978a8f1b8bacd2ffa133ba9aeda5dfd8f45c1737..b3dc70c93f5dce79bb8536a4a7b5fae845ca4523 100644
(file)
--- a/
module/elmcan.c
+++ b/
module/elmcan.c
@@
-164,7
+164,7
@@
static void elm327_send(struct elmcan *elm, const void *buf, size_t len)
set_bit(TTY_DO_WRITE_WAKEUP, &elm->tty->flags);
actual = elm->tty->ops->write(elm->tty, elm->txbuf, len);
if (actual < 0) {
set_bit(TTY_DO_WRITE_WAKEUP, &elm->tty->flags);
actual = elm->tty->ops->write(elm->tty, elm->txbuf, len);
if (actual < 0) {
-
pr_err("Failed to write to tty for %s.\n", elm->dev
->name);
+
netdev_err(elm->dev, "Failed to write to tty %s.\n", elm->tty
->name);
elm327_hw_failure(elm);
}
elm327_hw_failure(elm);
}
@@
-558,7
+558,7
@@
static void elm327_handle_prompt(struct elmcan *elm)
elm->next_init_cmd++;
if (!(*elm->next_init_cmd)) {
clear_bit(ELM_TODO_INIT, &elm->cmds_todo);
elm->next_init_cmd++;
if (!(*elm->next_init_cmd)) {
clear_bit(ELM_TODO_INIT, &elm->cmds_todo);
-
pr_info("%s: Initialization finished.\n", elm->dev->name
);
+
netdev_info(elm->dev, "Initialization finished.\n"
);
}
/* Some chips are unreliable and need extra time after
}
/* Some chips are unreliable and need extra time after
@@
-793,7
+793,7
@@
static netdev_tx_t elmcan_netdev_start_xmit(struct sk_buff *skb, struct net_devi
goto out;
if (!netif_running(dev)) {
goto out;
if (!netif_running(dev)) {
-
pr_warn("%s: xmit: iface is down\n", dev->name
);
+
netdev_warn(elm->dev, "xmit: iface is down.\n"
);
goto out;
}
goto out;
}
@@
-966,7
+966,7
@@
static void elmcan_ldisc_tx_worker(struct work_struct *work)
actual = elm->tty->ops->write(elm->tty, elm->txhead, elm->txleft);
if (actual < 0) {
actual = elm->tty->ops->write(elm->tty, elm->txhead, elm->txleft);
if (actual < 0) {
-
pr_err("Failed to write to tty for %s.\n", elm->dev
->name);
+
netdev_err(elm->dev, "Failed to write to tty %s.\n", elm->tty
->name);
elm327_hw_failure(elm);
}
elm327_hw_failure(elm);
}