staging: lustre: obdclass: genops: remove unneeded null test before free

Kfree can cope with a null argument, so drop null tests.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@ expression ptr; @@

- if (ptr != NULL)
  kfree(ptr);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
index a107aea392e194b859db036c83daee139a2fcfee..37d6aefde5349cc921bac5b7d5dfccf056fc706c 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -213,12 +213,9 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
        return 0;
 
  failed:
-       if (type->typ_name != NULL)
-               kfree(type->typ_name);
-       if (type->typ_md_ops != NULL)
-               kfree(type->typ_md_ops);
-       if (type->typ_dt_ops != NULL)
-               kfree(type->typ_dt_ops);
+       kfree(type->typ_name);
+       kfree(type->typ_md_ops);
+       kfree(type->typ_dt_ops);
        kfree(type);
        return rc;
 }
@@ -253,10 +250,8 @@ int class_unregister_type(const char *name)
        list_del(&type->typ_chain);
        spin_unlock(&obd_types_lock);
        kfree(type->typ_name);
-       if (type->typ_dt_ops != NULL)
-               kfree(type->typ_dt_ops);
-       if (type->typ_md_ops != NULL)
-               kfree(type->typ_md_ops);
+       kfree(type->typ_dt_ops);
+       kfree(type->typ_md_ops);
        kfree(type);
        return 0;
 } /* class_unregister_type */