diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2018-10-08 03:02:32 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-09-04 07:29:14 -0400 |
commit | ff7fbea4c133188bdeb2b440a8e762f6c908a19b (patch) | |
tree | cf110446bd537e926a95ae6375938349e05d384c /net/can/proc.c | |
parent | 56be1d52fc0b3f7d50af9f5beec9967c6786563f (diff) |
can: proc: give variable holding the CAN per device receive lists a sensible name
This patch gives the variables holding the CAN per device receive filter lists
a better name by renaming them from "d" to "dev_rcv_lists".
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>
Diffstat (limited to 'net/can/proc.c')
-rw-r--r-- | net/can/proc.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/net/can/proc.c b/net/can/proc.c index 6561d74a1012..560fa3c132bf 100644 --- a/net/can/proc.c +++ b/net/can/proc.c | |||
@@ -300,11 +300,11 @@ static int can_version_proc_show(struct seq_file *m, void *v) | |||
300 | 300 | ||
301 | static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx, | 301 | static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx, |
302 | struct net_device *dev, | 302 | struct net_device *dev, |
303 | struct can_dev_rcv_lists *d) | 303 | struct can_dev_rcv_lists *dev_rcv_lists) |
304 | { | 304 | { |
305 | if (!hlist_empty(&d->rx[idx])) { | 305 | if (!hlist_empty(&dev_rcv_lists->rx[idx])) { |
306 | can_print_recv_banner(m); | 306 | can_print_recv_banner(m); |
307 | can_print_rcvlist(m, &d->rx[idx], dev); | 307 | can_print_rcvlist(m, &dev_rcv_lists->rx[idx], dev); |
308 | } else | 308 | } else |
309 | seq_printf(m, " (%s: no entry)\n", DNAME(dev)); | 309 | seq_printf(m, " (%s: no entry)\n", DNAME(dev)); |
310 | 310 | ||
@@ -315,7 +315,7 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v) | |||
315 | /* double cast to prevent GCC warning */ | 315 | /* double cast to prevent GCC warning */ |
316 | int idx = (int)(long)PDE_DATA(m->file->f_inode); | 316 | int idx = (int)(long)PDE_DATA(m->file->f_inode); |
317 | struct net_device *dev; | 317 | struct net_device *dev; |
318 | struct can_dev_rcv_lists *d; | 318 | struct can_dev_rcv_lists *dev_rcv_lists; |
319 | struct net *net = m->private; | 319 | struct net *net = m->private; |
320 | 320 | ||
321 | seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]); | 321 | seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]); |
@@ -323,8 +323,8 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v) | |||
323 | rcu_read_lock(); | 323 | rcu_read_lock(); |
324 | 324 | ||
325 | /* receive list for 'all' CAN devices (dev == NULL) */ | 325 | /* receive list for 'all' CAN devices (dev == NULL) */ |
326 | d = net->can.rx_alldev_list; | 326 | dev_rcv_lists = net->can.rx_alldev_list; |
327 | can_rcvlist_proc_show_one(m, idx, NULL, d); | 327 | can_rcvlist_proc_show_one(m, idx, NULL, dev_rcv_lists); |
328 | 328 | ||
329 | /* receive list for registered CAN devices */ | 329 | /* receive list for registered CAN devices */ |
330 | for_each_netdev_rcu(net, dev) { | 330 | for_each_netdev_rcu(net, dev) { |
@@ -366,7 +366,7 @@ static inline void can_rcvlist_proc_show_array(struct seq_file *m, | |||
366 | static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) | 366 | static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) |
367 | { | 367 | { |
368 | struct net_device *dev; | 368 | struct net_device *dev; |
369 | struct can_dev_rcv_lists *d; | 369 | struct can_dev_rcv_lists *dev_rcv_lists; |
370 | struct net *net = m->private; | 370 | struct net *net = m->private; |
371 | 371 | ||
372 | /* RX_SFF */ | 372 | /* RX_SFF */ |
@@ -375,15 +375,16 @@ static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) | |||
375 | rcu_read_lock(); | 375 | rcu_read_lock(); |
376 | 376 | ||
377 | /* sff receive list for 'all' CAN devices (dev == NULL) */ | 377 | /* sff receive list for 'all' CAN devices (dev == NULL) */ |
378 | d = net->can.rx_alldev_list; | 378 | dev_rcv_lists = net->can.rx_alldev_list; |
379 | can_rcvlist_proc_show_array(m, NULL, d->rx_sff, ARRAY_SIZE(d->rx_sff)); | 379 | can_rcvlist_proc_show_array(m, NULL, dev_rcv_lists->rx_sff, |
380 | ARRAY_SIZE(dev_rcv_lists->rx_sff)); | ||
380 | 381 | ||
381 | /* sff receive list for registered CAN devices */ | 382 | /* sff receive list for registered CAN devices */ |
382 | for_each_netdev_rcu(net, dev) { | 383 | for_each_netdev_rcu(net, dev) { |
383 | if (dev->type == ARPHRD_CAN && dev->ml_priv) { | 384 | if (dev->type == ARPHRD_CAN && dev->ml_priv) { |
384 | d = dev->ml_priv; | 385 | dev_rcv_lists = dev->ml_priv; |
385 | can_rcvlist_proc_show_array(m, dev, d->rx_sff, | 386 | can_rcvlist_proc_show_array(m, dev, dev_rcv_lists->rx_sff, |
386 | ARRAY_SIZE(d->rx_sff)); | 387 | ARRAY_SIZE(dev_rcv_lists->rx_sff)); |
387 | } | 388 | } |
388 | } | 389 | } |
389 | 390 | ||
@@ -396,7 +397,7 @@ static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v) | |||
396 | static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v) | 397 | static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v) |
397 | { | 398 | { |
398 | struct net_device *dev; | 399 | struct net_device *dev; |
399 | struct can_dev_rcv_lists *d; | 400 | struct can_dev_rcv_lists *dev_rcv_lists; |
400 | struct net *net = m->private; | 401 | struct net *net = m->private; |
401 | 402 | ||
402 | /* RX_EFF */ | 403 | /* RX_EFF */ |
@@ -405,15 +406,16 @@ static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v) | |||
405 | rcu_read_lock(); | 406 | rcu_read_lock(); |
406 | 407 | ||
407 | /* eff receive list for 'all' CAN devices (dev == NULL) */ | 408 | /* eff receive list for 'all' CAN devices (dev == NULL) */ |
408 | d = net->can.rx_alldev_list; | 409 | dev_rcv_lists = net->can.rx_alldev_list; |
409 | can_rcvlist_proc_show_array(m, NULL, d->rx_eff, ARRAY_SIZE(d->rx_eff)); | 410 | can_rcvlist_proc_show_array(m, NULL, dev_rcv_lists->rx_eff, |
411 | ARRAY_SIZE(dev_rcv_lists->rx_eff)); | ||
410 | 412 | ||
411 | /* eff receive list for registered CAN devices */ | 413 | /* eff receive list for registered CAN devices */ |
412 | for_each_netdev_rcu(net, dev) { | 414 | for_each_netdev_rcu(net, dev) { |
413 | if (dev->type == ARPHRD_CAN && dev->ml_priv) { | 415 | if (dev->type == ARPHRD_CAN && dev->ml_priv) { |
414 | d = dev->ml_priv; | 416 | dev_rcv_lists = dev->ml_priv; |
415 | can_rcvlist_proc_show_array(m, dev, d->rx_eff, | 417 | can_rcvlist_proc_show_array(m, dev, dev_rcv_lists->rx_eff, |
416 | ARRAY_SIZE(d->rx_eff)); | 418 | ARRAY_SIZE(dev_rcv_lists->rx_eff)); |
417 | } | 419 | } |
418 | } | 420 | } |
419 | 421 | ||