USB: gadget: udc: gr_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: Felipe Balbi <balbi@kernel.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Jaejoong Kim <climbbb.kim@gmail.com>
Cc: Li Yang <leoyang.li@nxp.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index ca83c15d8ea47b1183ee7078a7344674fb65426c..729e60e495641c8a523265f6812c5b34c1f23213 100644 (file)
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -209,15 +209,12 @@ static void gr_dfs_create(struct gr_udc *dev)
        const char *name = "gr_udc_state";
 
        dev->dfs_root = debugfs_create_dir(dev_name(dev->dev), NULL);
-       dev->dfs_state = debugfs_create_file(name, 0444, dev->dfs_root, dev,
-                                            &gr_dfs_fops);
+       debugfs_create_file(name, 0444, dev->dfs_root, dev, &gr_dfs_fops);
 }
 
 static void gr_dfs_delete(struct gr_udc *dev)
 {
-       /* Handles NULL and ERR pointers internally */
-       debugfs_remove(dev->dfs_state);
-       debugfs_remove(dev->dfs_root);
+       debugfs_remove_recursive(dev->dfs_root);
 }
 
 #else /* !CONFIG_USB_GADGET_DEBUG_FS */

diff --git a/drivers/usb/gadget/udc/gr_udc.h b/drivers/usb/gadget/udc/gr_udc.h
index 3e913268c8c5c4690e92d48872e8cb435f45e6e0..417ad2aa2cc738342fdf5e8058acaa79d4f7338d 100644 (file)
--- a/drivers/usb/gadget/udc/gr_udc.h
+++ b/drivers/usb/gadget/udc/gr_udc.h
@@ -217,7 +217,6 @@ struct gr_udc {
        spinlock_t lock; /* General lock, a.k.a. "dev->lock" in comments */
 
        struct dentry *dfs_root;
-       struct dentry *dfs_state;
 };
 
 #define to_gr_udc(gadget)      (container_of((gadget), struct gr_udc, gadget))