diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-08-13 09:29:10 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-08-13 17:32:20 +0200 |
| commit | 1cf571eb81d3f435e6a4ea359a08b35cb7c5f81a (patch) | |
| tree | 605ede53ba34d3ddb3993241ce73be8e68d00f4a /net/can | |
| parent | b11844b6068cf091640e6e43a27906b2c5bf86fa (diff) | |
| download | linux-1cf571eb81d3f435e6a4ea359a08b35cb7c5f81a.tar.gz linux-1cf571eb81d3f435e6a4ea359a08b35cb7c5f81a.tar.bz2 linux-1cf571eb81d3f435e6a4ea359a08b35cb7c5f81a.zip | |
can: af_can: avoid splitting quoted string across lines
This patch joins all error message strings in af_can to be in single
lines, to ease searching for them.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/af_can.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 1fa6abf15302..020e019cf4e3 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -134,8 +134,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol, * return -EPROTONOSUPPORT */ if (err) - printk_ratelimited(KERN_ERR "can: request_module " - "(can-proto-%d) failed.\n", protocol); + pr_err_ratelimited("can: request_module (can-proto-%d) failed.\n", + protocol); cp = can_get_proto(protocol); } @@ -391,7 +391,6 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, /* extra filterlists for the subscription of a single non-RTR can_id */ if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) && !(*can_id & CAN_RTR_FLAG)) { - if (*can_id & CAN_EFF_FLAG) { if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) return &d->rx_eff[effhash(*can_id)]; @@ -529,8 +528,7 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, d = find_dev_rcv_lists(net, dev); if (!d) { - pr_err("BUG: receive list not found for " - "dev %s, id %03X, mask %03X\n", + pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n", DNAME(dev), can_id, mask); goto out; } @@ -553,8 +551,8 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, */ if (!r) { - WARN(1, "BUG: receive list entry not found for dev %s, " - "id %03X, mask %03X\n", DNAME(dev), can_id, mask); + WARN(1, "BUG: receive list entry not found for dev %s, id %03X, mask %03X\n", + DNAME(dev), can_id, mask); goto out; } @@ -797,7 +795,6 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, return NOTIFY_DONE; switch (msg) { - case NETDEV_REGISTER: /* create new dev_rcv_lists for this device */ @@ -821,8 +818,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, dev->ml_priv = NULL; } } else { - pr_err("can: notifier: receive list not found for dev " - "%s\n", dev->name); + pr_err("can: notifier: receive list not found for dev %s\n", + dev->name); } spin_unlock(&dev_net(dev)->can.can_rcvlists_lock); |