Skip to content

Commit edbeb6b

Browse files
committed
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 <[email protected]> Cc: Haojian Zhuang <[email protected]> Cc: Felipe Balbi <[email protected]> Acked-by: Robert Jarzmik <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 37ea710 commit edbeb6b

File tree

2 files changed

+6
-40
lines changed

2 files changed

+6
-40
lines changed

drivers/usb/gadget/udc/pxa27x_udc.c

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -205,50 +205,19 @@ DEFINE_SHOW_ATTRIBUTE(eps_dbg);
205205

206206
static void pxa_init_debugfs(struct pxa_udc *udc)
207207
{
208-
struct dentry *root, *state, *queues, *eps;
208+
struct dentry *root;
209209

210210
root = debugfs_create_dir(udc->gadget.name, NULL);
211-
if (IS_ERR(root) || !root)
212-
goto err_root;
213-
214-
state = debugfs_create_file("udcstate", 0400, root, udc,
215-
&state_dbg_fops);
216-
if (!state)
217-
goto err_state;
218-
queues = debugfs_create_file("queues", 0400, root, udc,
219-
&queues_dbg_fops);
220-
if (!queues)
221-
goto err_queues;
222-
eps = debugfs_create_file("epstate", 0400, root, udc,
223-
&eps_dbg_fops);
224-
if (!eps)
225-
goto err_eps;
226-
227211
udc->debugfs_root = root;
228-
udc->debugfs_state = state;
229-
udc->debugfs_queues = queues;
230-
udc->debugfs_eps = eps;
231-
return;
232-
err_eps:
233-
debugfs_remove(eps);
234-
err_queues:
235-
debugfs_remove(queues);
236-
err_state:
237-
debugfs_remove(root);
238-
err_root:
239-
dev_err(udc->dev, "debugfs is not available\n");
212+
213+
debugfs_create_file("udcstate", 0400, root, udc, &state_dbg_fops);
214+
debugfs_create_file("queues", 0400, root, udc, &queues_dbg_fops);
215+
debugfs_create_file("epstate", 0400, root, udc, &eps_dbg_fops);
240216
}
241217

242218
static void pxa_cleanup_debugfs(struct pxa_udc *udc)
243219
{
244-
debugfs_remove(udc->debugfs_eps);
245-
debugfs_remove(udc->debugfs_queues);
246-
debugfs_remove(udc->debugfs_state);
247-
debugfs_remove(udc->debugfs_root);
248-
udc->debugfs_eps = NULL;
249-
udc->debugfs_queues = NULL;
250-
udc->debugfs_state = NULL;
251-
udc->debugfs_root = NULL;
220+
debugfs_remove_recursive(udc->debugfs_root);
252221
}
253222

254223
#else

drivers/usb/gadget/udc/pxa27x_udc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,6 @@ struct pxa_udc {
476476
#endif
477477
#ifdef CONFIG_USB_GADGET_DEBUG_FS
478478
struct dentry *debugfs_root;
479-
struct dentry *debugfs_state;
480-
struct dentry *debugfs_queues;
481-
struct dentry *debugfs_eps;
482479
#endif
483480
};
484481
#define to_pxa(g) (container_of((g), struct pxa_udc, gadget))

0 commit comments

Comments
 (0)