USB: gadget: udc: pxa27x_udc: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

There is also no need to keep the file dentries around at all, so remove
those variables from the device structure.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Felipe Balbi <balbi@kernel.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index a58242e..0142332 100644 (file)
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -205,50 +205,19 @@ DEFINE_SHOW_ATTRIBUTE(eps_dbg);
 
 static void pxa_init_debugfs(struct pxa_udc *udc)
 {
-       struct dentry *root, *state, *queues, *eps;
+       struct dentry *root;
 
        root = debugfs_create_dir(udc->gadget.name, NULL);
-       if (IS_ERR(root) || !root)
-               goto err_root;
-
-       state = debugfs_create_file("udcstate", 0400, root, udc,
-                       &state_dbg_fops);
-       if (!state)
-               goto err_state;
-       queues = debugfs_create_file("queues", 0400, root, udc,
-                       &queues_dbg_fops);
-       if (!queues)
-               goto err_queues;
-       eps = debugfs_create_file("epstate", 0400, root, udc,
-                       &eps_dbg_fops);
-       if (!eps)
-               goto err_eps;
-
        udc->debugfs_root = root;
-       udc->debugfs_state = state;
-       udc->debugfs_queues = queues;
-       udc->debugfs_eps = eps;
-       return;
-err_eps:
-       debugfs_remove(eps);
-err_queues:
-       debugfs_remove(queues);
-err_state:
-       debugfs_remove(root);
-err_root:
-       dev_err(udc->dev, "debugfs is not available\n");
+
+       debugfs_create_file("udcstate", 0400, root, udc, &state_dbg_fops);
+       debugfs_create_file("queues", 0400, root, udc, &queues_dbg_fops);
+       debugfs_create_file("epstate", 0400, root, udc, &eps_dbg_fops);
 }
 
 static void pxa_cleanup_debugfs(struct pxa_udc *udc)
 {
-       debugfs_remove(udc->debugfs_eps);
-       debugfs_remove(udc->debugfs_queues);
-       debugfs_remove(udc->debugfs_state);
-       debugfs_remove(udc->debugfs_root);
-       udc->debugfs_eps = NULL;
-       udc->debugfs_queues = NULL;
-       udc->debugfs_state = NULL;
-       udc->debugfs_root = NULL;
+       debugfs_remove_recursive(udc->debugfs_root);
 }
 
 #else

diff --git a/drivers/usb/gadget/udc/pxa27x_udc.h b/drivers/usb/gadget/udc/pxa27x_udc.h
index 1128d39..13b2977 100644 (file)
--- a/drivers/usb/gadget/udc/pxa27x_udc.h
+++ b/drivers/usb/gadget/udc/pxa27x_udc.h
@@ -476,9 +476,6 @@ struct pxa_udc {
 #endif
 #ifdef CONFIG_USB_GADGET_DEBUG_FS
        struct dentry                           *debugfs_root;
-       struct dentry                           *debugfs_state;
-       struct dentry                           *debugfs_queues;
-       struct dentry                           *debugfs_eps;
 #endif
 };
 #define to_pxa(g)      (container_of((g), struct pxa_udc, gadget))