The static switchdev_port_vlan_dump_put function does not need the net_device parameter, so remove it.
Showing the changes to net/switchdev/switchdev.c (1 of 1 file). Show all
Unified · Split
| @@ -484,8 +484,7 @@ struct switchdev_vlan_dump { · 483 unmodified lines | ||
| 484 | 484 | u16 end; |
| 485 | 485 | }; |
| 486 | 486 | |
| 487 | −static int switchdev_port_vlan_dump_put(struct net_device *dev, | |
| 488 | − struct switchdev_vlan_dump *dump) | |
| 487 | +static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump) | |
| 489 | 488 | { |
| 490 | 489 | struct bridge_vlan_info vinfo; |
| 491 | 490 | |
| @@ -531,7 +530,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, · 39 unmodified lines | ||
| 531 | 530 | for (dump->begin = dump->end = vlan->vid_begin; |
| 532 | 531 | dump->begin <= vlan->vid_end; |
| 533 | 532 | dump->begin++, dump->end++) { |
| 534 | − err = switchdev_port_vlan_dump_put(dev, dump); | |
| 533 | + err = switchdev_port_vlan_dump_put(dump); | |
| 535 | 534 | if (err) |
| 536 | 535 | return err; |
| 537 | 536 | } |
| @@ -543,7 +542,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, · 5 unmodified lines | ||
| 543 | 542 | /* prepend */ |
| 544 | 543 | dump->begin = vlan->vid_begin; |
| 545 | 544 | } else { |
| 546 | − err = switchdev_port_vlan_dump_put(dev, dump); | |
| 545 | + err = switchdev_port_vlan_dump_put(dump); | |
| 547 | 546 | dump->flags = vlan->flags; |
| 548 | 547 | dump->begin = vlan->vid_begin; |
| 549 | 548 | dump->end = vlan->vid_end; |
| @@ -555,7 +554,7 @@ static int switchdev_port_vlan_dump_cb(struct net_device *dev, · 5 unmodified lines | ||
| 555 | 554 | /* append */ |
| 556 | 555 | dump->end = vlan->vid_end; |
| 557 | 556 | } else { |
| 558 | − err = switchdev_port_vlan_dump_put(dev, dump); | |
| 557 | + err = switchdev_port_vlan_dump_put(dump); | |
| 559 | 558 | dump->flags = vlan->flags; |
| 560 | 559 | dump->begin = vlan->vid_begin; |
| 561 | 560 | dump->end = vlan->vid_end; |
| @@ -588,7 +587,7 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev, · 26 unmodified lines | ||
| 588 | 587 | goto err_out; |
| 589 | 588 | if (filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED) |
| 590 | 589 | /* last one */ |
| 591 | − err = switchdev_port_vlan_dump_put(dev, &dump); | |
| 590 | + err = switchdev_port_vlan_dump_put(&dump); | |
| 592 | 591 | } |
| 593 | 592 | |
| 594 | 593 | err_out: |