aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-29 11:31:03 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-31 06:54:22 -0400
commitda281a8e972fa97cf74344a98eb415116744b569 (patch)
tree0be71da352ecc3f115b7611bfc7677410e8367e3
parenta143dca4f3340dfc6febd7a4022c6ffb2bf2dad4 (diff)
USB: gadget: udc: bcm63xx_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: Kevin Cernekee <cernekee@gmail.com> Cc: Felipe Balbi <balbi@kernel.org> Cc: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/udc/bcm63xx_udc.c37
1 files changed, 5 insertions, 32 deletions
diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index 3a8df8601074..c1fcc77403ea 100644
--- a/drivers/usb/gadget/udc/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
@@ -288,8 +288,6 @@ struct bcm63xx_req {
288 * @ep0_reply: Pending reply from gadget driver. 288 * @ep0_reply: Pending reply from gadget driver.
289 * @ep0_request: Outstanding ep0 request. 289 * @ep0_request: Outstanding ep0 request.
290 * @debugfs_root: debugfs directory: /sys/kernel/debug/<DRV_MODULE_NAME>. 290 * @debugfs_root: debugfs directory: /sys/kernel/debug/<DRV_MODULE_NAME>.
291 * @debugfs_usbd: debugfs file "usbd" for controller state.
292 * @debugfs_iudma: debugfs file "usbd" for IUDMA state.
293 */ 291 */
294struct bcm63xx_udc { 292struct bcm63xx_udc {
295 spinlock_t lock; 293 spinlock_t lock;
@@ -330,8 +328,6 @@ struct bcm63xx_udc {
330 struct usb_request *ep0_request; 328 struct usb_request *ep0_request;
331 329
332 struct dentry *debugfs_root; 330 struct dentry *debugfs_root;
333 struct dentry *debugfs_usbd;
334 struct dentry *debugfs_iudma;
335}; 331};
336 332
337static const struct usb_ep_ops bcm63xx_udc_ep_ops; 333static const struct usb_ep_ops bcm63xx_udc_ep_ops;
@@ -2247,34 +2243,16 @@ DEFINE_SHOW_ATTRIBUTE(bcm63xx_iudma_dbg);
2247 */ 2243 */
2248static void bcm63xx_udc_init_debugfs(struct bcm63xx_udc *udc) 2244static void bcm63xx_udc_init_debugfs(struct bcm63xx_udc *udc)
2249{ 2245{
2250 struct dentry *root, *usbd, *iudma; 2246 struct dentry *root;
2251 2247
2252 if (!IS_ENABLED(CONFIG_USB_GADGET_DEBUG_FS)) 2248 if (!IS_ENABLED(CONFIG_USB_GADGET_DEBUG_FS))
2253 return; 2249 return;
2254 2250
2255 root = debugfs_create_dir(udc->gadget.name, NULL); 2251 root = debugfs_create_dir(udc->gadget.name, NULL);
2256 if (IS_ERR(root) || !root)
2257 goto err_root;
2258
2259 usbd = debugfs_create_file("usbd", 0400, root, udc,
2260 &bcm63xx_usbd_dbg_fops);
2261 if (!usbd)
2262 goto err_usbd;
2263 iudma = debugfs_create_file("iudma", 0400, root, udc,
2264 &bcm63xx_iudma_dbg_fops);
2265 if (!iudma)
2266 goto err_iudma;
2267
2268 udc->debugfs_root = root; 2252 udc->debugfs_root = root;
2269 udc->debugfs_usbd = usbd; 2253
2270 udc->debugfs_iudma = iudma; 2254 debugfs_create_file("usbd", 0400, root, udc, &bcm63xx_usbd_dbg_fops);
2271 return; 2255 debugfs_create_file("iudma", 0400, root, udc, &bcm63xx_iudma_dbg_fops);
2272err_iudma:
2273 debugfs_remove(usbd);
2274err_usbd:
2275 debugfs_remove(root);
2276err_root:
2277 dev_err(udc->dev, "debugfs is not available\n");
2278} 2256}
2279 2257
2280/** 2258/**
@@ -2285,12 +2263,7 @@ err_root:
2285 */ 2263 */
2286static void bcm63xx_udc_cleanup_debugfs(struct bcm63xx_udc *udc) 2264static void bcm63xx_udc_cleanup_debugfs(struct bcm63xx_udc *udc)
2287{ 2265{
2288 debugfs_remove(udc->debugfs_iudma); 2266 debugfs_remove_recursive(udc->debugfs_root);
2289 debugfs_remove(udc->debugfs_usbd);
2290 debugfs_remove(udc->debugfs_root);
2291 udc->debugfs_iudma = NULL;
2292 udc->debugfs_usbd = NULL;
2293 udc->debugfs_root = NULL;
2294} 2267}
2295 2268
2296/*********************************************************************** 2269/***********************************************************************