net: sched: taprio: Remove should_restart_cycle()

The 'entry' argument from should_restart_cycle() cannot be NULL since it
is already checked by the caller so the WARN_ON() within should_
restart_cycle() could be removed.  By doing that, that function becomes
a dummy wrapper on list_is_last() so this patch simply gets rid of it
and call list_is_last() within advance_sched() instead.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index d0aae7b5e6081e2467b5af47edcd4511b02fba6e..77cca993710a79811bceed54a01eae0dd035bb75 100644 (file)
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -209,14 +209,6 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
        return NULL;
 }
 
-static bool should_restart_cycle(const struct taprio_sched *q,
-                                const struct sched_entry *entry)
-{
-       WARN_ON(!entry);
-
-       return list_is_last(&entry->list, &q->entries);
-}
-
 static enum hrtimer_restart advance_sched(struct hrtimer *timer)
 {
        struct taprio_sched *q = container_of(timer, struct taprio_sched,
@@ -240,7 +232,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer)
                goto first_run;
        }
 
-       if (should_restart_cycle(q, entry))
+       if (list_is_last(&entry->list, &q->entries))
                next = list_first_entry(&q->entries, struct sched_entry,
                                        list);
        else