aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-29 11:31:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-31 06:54:22 -0400
commit37ea71074d13e06bbceeef6d465df81c86c99860 (patch)
tree820dcc68041a315e926b0ca8ac5c18c8dba7c8e3
parentda281a8e972fa97cf74344a98eb415116744b569 (diff)
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>
-rw-r--r--drivers/usb/gadget/udc/gr_udc.c7
-rw-r--r--drivers/usb/gadget/udc/gr_udc.h1
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index ca83c15d8ea4..729e60e49564 100644
--- 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)
209 const char *name = "gr_udc_state"; 209 const char *name = "gr_udc_state";
210 210
211 dev->dfs_root = debugfs_create_dir(dev_name(dev->dev), NULL); 211 dev->dfs_root = debugfs_create_dir(dev_name(dev->dev), NULL);
212 dev->dfs_state = debugfs_create_file(name, 0444, dev->dfs_root, dev, 212 debugfs_create_file(name, 0444, dev->dfs_root, dev, &gr_dfs_fops);
213 &gr_dfs_fops);
214} 213}
215 214
216static void gr_dfs_delete(struct gr_udc *dev) 215static void gr_dfs_delete(struct gr_udc *dev)
217{ 216{
218 /* Handles NULL and ERR pointers internally */ 217 debugfs_remove_recursive(dev->dfs_root);
219 debugfs_remove(dev->dfs_state);
220 debugfs_remove(dev->dfs_root);
221} 218}
222 219
223#else /* !CONFIG_USB_GADGET_DEBUG_FS */ 220#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 3e913268c8c5..417ad2aa2cc7 100644
--- a/drivers/usb/gadget/udc/gr_udc.h
+++ b/drivers/usb/gadget/udc/gr_udc.h
@@ -217,7 +217,6 @@ struct gr_udc {
217 spinlock_t lock; /* General lock, a.k.a. "dev->lock" in comments */ 217 spinlock_t lock; /* General lock, a.k.a. "dev->lock" in comments */
218 218
219 struct dentry *dfs_root; 219 struct dentry *dfs_root;
220 struct dentry *dfs_state;
221}; 220};
222 221
223#define to_gr_udc(gadget) (container_of((gadget), struct gr_udc, gadget)) 222#define to_gr_udc(gadget) (container_of((gadget), struct gr_udc, gadget))