| Message ID | 20200224130831.25347-5-olteanv@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | Wire up Ocelot tc-flower to Felix DSA | expand |
On 24.02.2020 15:08, Vladimir Oltean wrote: >EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > >From: Vladimir Oltean <vladimir.oltean@nxp.com> > >There is no need to check the "ret" variable, one can just return the >function result back to the caller. > >Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> >--- > drivers/net/ethernet/mscc/ocelot_flower.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > >diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c >index 698e9fee6b1a..8993dadf063c 100644 >--- a/drivers/net/ethernet/mscc/ocelot_flower.c >+++ b/drivers/net/ethernet/mscc/ocelot_flower.c >@@ -192,11 +192,7 @@ int ocelot_cls_flower_replace(struct ocelot *ocelot, int port, > return ret; > } > >- ret = ocelot_ace_rule_offload_add(ocelot, ace); >- if (ret) >- return ret; >- >- return 0; >+ return ocelot_ace_rule_offload_add(ocelot, ace); > } > EXPORT_SYMBOL_GPL(ocelot_cls_flower_replace); > >@@ -204,16 +200,11 @@ int ocelot_cls_flower_destroy(struct ocelot *ocelot, int port, > struct flow_cls_offload *f, bool ingress) > { > struct ocelot_ace_rule ace; >- int ret; > > ace.prio = f->common.prio; > ace.id = f->cookie; > >- ret = ocelot_ace_rule_offload_del(ocelot, &ace); >- if (ret) >- return ret; >- >- return 0; >+ return ocelot_ace_rule_offload_del(ocelot, &ace); > } > EXPORT_SYMBOL_GPL(ocelot_cls_flower_destroy); > >-- >2.17.1 > Reviewed-by: Allan W. Nielsen <allan.nielsen@microchip.com>
diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c index 698e9fee6b1a..8993dadf063c 100644 --- a/drivers/net/ethernet/mscc/ocelot_flower.c +++ b/drivers/net/ethernet/mscc/ocelot_flower.c @@ -192,11 +192,7 @@ int ocelot_cls_flower_replace(struct ocelot *ocelot, int port, return ret; } - ret = ocelot_ace_rule_offload_add(ocelot, ace); - if (ret) - return ret; - - return 0; + return ocelot_ace_rule_offload_add(ocelot, ace); } EXPORT_SYMBOL_GPL(ocelot_cls_flower_replace); @@ -204,16 +200,11 @@ int ocelot_cls_flower_destroy(struct ocelot *ocelot, int port, struct flow_cls_offload *f, bool ingress) { struct ocelot_ace_rule ace; - int ret; ace.prio = f->common.prio; ace.id = f->cookie; - ret = ocelot_ace_rule_offload_del(ocelot, &ace); - if (ret) - return ret; - - return 0; + return ocelot_ace_rule_offload_del(ocelot, &ace); } EXPORT_SYMBOL_GPL(ocelot_cls_flower_destroy);