Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: musb: clean up debugfs file and directory creation

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.

Because of this, lots of init functions do not need to have return
values, so this cleans up a lot of unused error handling code that never
could have triggered in the past.

Cc: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+11 -52
+1 -4
drivers/usb/musb/musb_core.c
··· 2387 2387 if (status < 0) 2388 2388 goto fail3; 2389 2389 2390 - status = musb_init_debugfs(musb); 2391 - if (status < 0) 2392 - goto fail4; 2390 + musb_init_debugfs(musb); 2393 2391 2394 2392 status = sysfs_create_group(&musb->controller->kobj, &musb_attr_group); 2395 2393 if (status) ··· 2402 2404 fail5: 2403 2405 musb_exit_debugfs(musb); 2404 2406 2405 - fail4: 2406 2407 musb_gadget_cleanup(musb); 2407 2408 musb_host_cleanup(musb); 2408 2409
+2 -3
drivers/usb/musb/musb_debug.h
··· 20 20 void musb_dbg(struct musb *musb, const char *fmt, ...); 21 21 22 22 #ifdef CONFIG_DEBUG_FS 23 - int musb_init_debugfs(struct musb *musb); 23 + void musb_init_debugfs(struct musb *musb); 24 24 void musb_exit_debugfs(struct musb *musb); 25 25 #else 26 - static inline int musb_init_debugfs(struct musb *musb) 26 + static inline void musb_init_debugfs(struct musb *musb) 27 27 { 28 - return 0; 29 28 } 30 29 static inline void musb_exit_debugfs(struct musb *musb) 31 30 {
+7 -37
drivers/usb/musb/musb_debugfs.c
··· 321 321 .release = single_release, 322 322 }; 323 323 324 - int musb_init_debugfs(struct musb *musb) 324 + void musb_init_debugfs(struct musb *musb) 325 325 { 326 - struct dentry *root; 327 - struct dentry *file; 328 - int ret; 326 + struct dentry *root; 329 327 330 328 root = debugfs_create_dir(dev_name(musb->controller), NULL); 331 - if (!root) { 332 - ret = -ENOMEM; 333 - goto err0; 334 - } 335 - 336 - file = debugfs_create_file("regdump", S_IRUGO, root, musb, 337 - &musb_regdump_fops); 338 - if (!file) { 339 - ret = -ENOMEM; 340 - goto err1; 341 - } 342 - 343 - file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, 344 - root, musb, &musb_test_mode_fops); 345 - if (!file) { 346 - ret = -ENOMEM; 347 - goto err1; 348 - } 349 - 350 - file = debugfs_create_file("softconnect", S_IRUGO | S_IWUSR, 351 - root, musb, &musb_softconnect_fops); 352 - if (!file) { 353 - ret = -ENOMEM; 354 - goto err1; 355 - } 356 - 357 329 musb->debugfs_root = root; 358 330 359 - return 0; 360 - 361 - err1: 362 - debugfs_remove_recursive(root); 363 - 364 - err0: 365 - return ret; 331 + debugfs_create_file("regdump", S_IRUGO, root, musb, &musb_regdump_fops); 332 + debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root, musb, 333 + &musb_test_mode_fops); 334 + debugfs_create_file("softconnect", S_IRUGO | S_IWUSR, root, musb, 335 + &musb_softconnect_fops); 366 336 } 367 337 368 338 void /* __init_or_exit */ musb_exit_debugfs(struct musb *musb)
+1 -8
drivers/usb/musb/musb_dsps.c
··· 399 399 static int dsps_musb_dbg_init(struct musb *musb, struct dsps_glue *glue) 400 400 { 401 401 struct dentry *root; 402 - struct dentry *file; 403 402 char buf[128]; 404 403 405 404 sprintf(buf, "%s.dsps", dev_name(musb->controller)); 406 405 root = debugfs_create_dir(buf, NULL); 407 - if (!root) 408 - return -ENOMEM; 409 406 glue->dbgfs_root = root; 410 407 411 408 glue->regset.regs = dsps_musb_regs; 412 409 glue->regset.nregs = ARRAY_SIZE(dsps_musb_regs); 413 410 glue->regset.base = musb->ctrl_base; 414 411 415 - file = debugfs_create_regset32("regdump", S_IRUGO, root, &glue->regset); 416 - if (!file) { 417 - debugfs_remove_recursive(root); 418 - return -ENOMEM; 419 - } 412 + debugfs_create_regset32("regdump", S_IRUGO, root, &glue->regset); 420 413 return 0; 421 414 } 422 415