From: Marc Kleine-Budde <mkl@pengutronix.de> mainline inclusion from mainline-v5.4-rc1 commit fac785009aaf2f6588649778617b33cb0dcd4c8e category: feature bugzilla: 38684 CVE: NA --------------------------- This patch add the commonly used prefix "can_" to the find_dev_rcv_lists() function and moves the "find" to the end, as the function returns a struct can_dev_rcv_list. This improves the overall readability of the code. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Conflicts: net/can/af_can.c Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Reviewed-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- net/can/af_can.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index a87ce39724ad..de229956a613 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -323,7 +323,7 @@ EXPORT_SYMBOL(can_send); * af_can rx path */ -static struct can_dev_rcv_lists *find_dev_rcv_lists(struct net *net, +static struct can_dev_rcv_lists *can_dev_rcv_lists_find(struct net *net, struct net_device *dev) { if (!dev) @@ -484,7 +484,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, spin_lock(&net->can.can_rcvlists_lock); - dev_rcv_lists = find_dev_rcv_lists(net, dev); + dev_rcv_lists = can_dev_rcv_lists_find(net, dev); if (dev_rcv_lists) { rl = can_rcv_list_find(&can_id, &mask, dev_rcv_lists); @@ -554,7 +554,7 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, spin_lock(&net->can.can_rcvlists_lock); - dev_rcv_lists = find_dev_rcv_lists(net, dev); + dev_rcv_lists = can_dev_rcv_lists_find(net, dev); if (!dev_rcv_lists) { pr_err("BUG: receive list not found for " "dev %s, id %03X, mask %03X\n", @@ -703,7 +703,7 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev) matches = can_rcv_filter(net->can.can_rx_alldev_list, skb); /* find receive list for this device */ - dev_rcv_lists = find_dev_rcv_lists(net, dev); + dev_rcv_lists = can_dev_rcv_lists_find(net, dev); if (dev_rcv_lists) matches += can_rcv_filter(dev_rcv_lists, skb); -- 2.25.1