sh: boards: mach-se: use IS_ERR() instead of NULL check

[~andy/linux] / net / sched / sch_cbq.c

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 28c01ef5abc815ae5429e29c34bba8b97b7d50f6..eb763159086501aa2887c2c80680e37fbf0aa4fc 100644 (file)
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1379,9 +1379,9 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt)
        q->link.sibling = &q->link;
        q->link.common.classid = sch->handle;
        q->link.qdisc = sch;
-       if (!(q->link.q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                           &pfifo_qdisc_ops,
-                                           sch->handle)))
+       q->link.q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
+                                     sch->handle);
+       if (!q->link.q)
                q->link.q = &noop_qdisc;
 
        q->link.priority = TC_CBQ_MAXPRIO-1;
@@ -1623,7 +1623,7 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
        struct cbq_class *cl = (struct cbq_class*)arg;
 
        if (new == NULL) {
-               new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+               new = qdisc_create_dflt(sch->dev_queue,
                                        &pfifo_qdisc_ops, cl->common.classid);
                if (new == NULL)
                        return -ENOBUFS;
@@ -1874,8 +1874,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
        cl->R_tab = rtab;
        rtab = NULL;
        cl->refcnt = 1;
-       if (!(cl->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                       &pfifo_qdisc_ops, classid)))
+       cl->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);
+       if (!cl->q)
                cl->q = &noop_qdisc;
        cl->common.classid = classid;
        cl->tparent = parent;