xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can: af_can: avoid splitting quoted string across lines

Browse Source 
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>
This commit is contained in:
Marc Kleine-Budde
2019-08-13 09:29:10 +02:00
parent b11844b606
commit 1cf571eb81
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/can/af_can.c
View File

@@ -134,8 +134,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
* return -EPROTONOSUPPORT * return -EPROTONOSUPPORT
*/ */
if (err) if (err)
printk_ratelimited(KERN_ERR "can: request_module " pr_err_ratelimited("can: request_module (can-proto-%d) failed.\n",
"(can-proto-%d) failed.\n", protocol); protocol);
cp = can_get_proto(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 */ /* extra filterlists for the subscription of a single non-RTR can_id */
if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) && if (((*mask & CAN_EFF_RTR_FLAGS) == CAN_EFF_RTR_FLAGS) &&
!(*can_id & CAN_RTR_FLAG)) { !(*can_id & CAN_RTR_FLAG)) {
if (*can_id & CAN_EFF_FLAG) { if (*can_id & CAN_EFF_FLAG) {
if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS)) if (*mask == (CAN_EFF_MASK | CAN_EFF_RTR_FLAGS))
return &d->rx_eff[effhash(*can_id)]; 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); d = find_dev_rcv_lists(net, dev);
if (!d) { if (!d) {
pr_err("BUG: receive list not found for " pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n",
"dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask); DNAME(dev), can_id, mask);
goto out; goto out;
} }
@@ -553,8 +551,8 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id,
*/ */
if (!r) { if (!r) {
WARN(1, "BUG: receive list entry not found for dev %s, " WARN(1, "BUG: receive list entry not found for dev %s, id %03X, mask %03X\n",
"id %03X, mask %03X\n", DNAME(dev), can_id, mask); DNAME(dev), can_id, mask);
goto out; goto out;
} }
@@ -797,7 +795,6 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
return NOTIFY_DONE; return NOTIFY_DONE;
switch (msg) { switch (msg) {
case NETDEV_REGISTER: case NETDEV_REGISTER:
/* create new dev_rcv_lists for this device */ /* 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; dev->ml_priv = NULL;
} }
} else { } else {
pr_err("can: notifier: receive list not found for dev " pr_err("can: notifier: receive list not found for dev %s\n",
"%s\n", dev->name); dev->name);
} }
spin_unlock(&dev_net(dev)->can.can_rcvlists_lock); spin_unlock(&dev_net(dev)->can.can_rcvlists_lock);