[PATCH] kfree cleanup: misc remaining drivers

This is the remaining misc drivers/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in misc files in
drivers/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
Acked-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Len Brown <len.brown@intel.com>
Acked-by: "Antonino A. Daplas" <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index ae7becf7efa5..9cb3ab156b09 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -202,16 +202,11 @@ static void free_port (struct parport *port)
         list_del(&port->full_list);
         spin_unlock(&full_list_lock);
         for (d = 0; d < 5; d++) {
-                if (port->probe_info[d].class_name)
-                        kfree (port->probe_info[d].class_name);
-                if (port->probe_info[d].mfr)
-                        kfree (port->probe_info[d].mfr);
-                if (port->probe_info[d].model)
-                        kfree (port->probe_info[d].model);
-                if (port->probe_info[d].cmdset)
-                        kfree (port->probe_info[d].cmdset);
-                if (port->probe_info[d].description)
-                        kfree (port->probe_info[d].description);
+                kfree(port->probe_info[d].class_name);
+                kfree(port->probe_info[d].mfr);
+                kfree(port->probe_info[d].model);
+                kfree(port->probe_info[d].cmdset);
+                kfree(port->probe_info[d].description);
         }
 
         kfree(port->name);
@@ -618,9 +613,9 @@ parport_register_device(struct parport *port, const char *name,
         return tmp;
 
  out_free_all:
-        kfree (tmp->state);
+        kfree(tmp->state);
  out_free_pardevice:
-        kfree (tmp);
+        kfree(tmp);
  out:
         parport_put_port (port);
         module_put(port->ops->owner);