aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-29 11:31:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-31 06:54:22 -0400
commit1dcd5696204af6f2f5e2a89d6ef7560a74cd41e7 (patch)
tree29ffc07558793b9fc83712e31b738319863ff318
parentb708692dda1edfc357dceca8219c79466778b777 (diff)
USB: dwc2: 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. Cc: Minas Harutyunyan <hminas@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/dwc2/debugfs.c78
1 files changed, 16 insertions, 62 deletions
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 7e6618ad9f21..d0bdb7997557 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -294,52 +294,30 @@ DEFINE_SHOW_ATTRIBUTE(ep);
294static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg) 294static void dwc2_hsotg_create_debug(struct dwc2_hsotg *hsotg)
295{ 295{
296 struct dentry *root; 296 struct dentry *root;
297 struct dentry *file;
298 unsigned int epidx; 297 unsigned int epidx;
299 298
300 root = hsotg->debug_root; 299 root = hsotg->debug_root;
301 300
302 /* create general state file */ 301 /* create general state file */
303 302 debugfs_create_file("state", 0444, root, hsotg, &state_fops);
304 file = debugfs_create_file("state", 0444, root, hsotg, &state_fops); 303 debugfs_create_file("testmode", 0644, root, hsotg, &testmode_fops);
305 if (IS_ERR(file)) 304 debugfs_create_file("fifo", 0444, root, hsotg, &fifo_fops);
306 dev_err(hsotg->dev, "%s: failed to create state\n", __func__);
307
308 file = debugfs_create_file("testmode", 0644, root, hsotg,
309 &testmode_fops);
310 if (IS_ERR(file))
311 dev_err(hsotg->dev, "%s: failed to create testmode\n",
312 __func__);
313
314 file = debugfs_create_file("fifo", 0444, root, hsotg, &fifo_fops);
315 if (IS_ERR(file))
316 dev_err(hsotg->dev, "%s: failed to create fifo\n", __func__);
317 305
318 /* Create one file for each out endpoint */ 306 /* Create one file for each out endpoint */
319 for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) { 307 for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
320 struct dwc2_hsotg_ep *ep; 308 struct dwc2_hsotg_ep *ep;
321 309
322 ep = hsotg->eps_out[epidx]; 310 ep = hsotg->eps_out[epidx];
323 if (ep) { 311 if (ep)
324 file = debugfs_create_file(ep->name, 0444, 312 debugfs_create_file(ep->name, 0444, root, ep, &ep_fops);
325 root, ep, &ep_fops);
326 if (IS_ERR(file))
327 dev_err(hsotg->dev, "failed to create %s debug file\n",
328 ep->name);
329 }
330 } 313 }
331 /* Create one file for each in endpoint. EP0 is handled with out eps */ 314 /* Create one file for each in endpoint. EP0 is handled with out eps */
332 for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) { 315 for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) {
333 struct dwc2_hsotg_ep *ep; 316 struct dwc2_hsotg_ep *ep;
334 317
335 ep = hsotg->eps_in[epidx]; 318 ep = hsotg->eps_in[epidx];
336 if (ep) { 319 if (ep)
337 file = debugfs_create_file(ep->name, 0444, 320 debugfs_create_file(ep->name, 0444, root, ep, &ep_fops);
338 root, ep, &ep_fops);
339 if (IS_ERR(file))
340 dev_err(hsotg->dev, "failed to create %s debug file\n",
341 ep->name);
342 }
343 } 321 }
344} 322}
345#else 323#else
@@ -792,32 +770,14 @@ DEFINE_SHOW_ATTRIBUTE(dr_mode);
792int dwc2_debugfs_init(struct dwc2_hsotg *hsotg) 770int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)
793{ 771{
794 int ret; 772 int ret;
795 struct dentry *file; 773 struct dentry *root;
796 774
797 hsotg->debug_root = debugfs_create_dir(dev_name(hsotg->dev), NULL); 775 root = debugfs_create_dir(dev_name(hsotg->dev), NULL);
798 if (!hsotg->debug_root) { 776 hsotg->debug_root = root;
799 ret = -ENOMEM;
800 goto err0;
801 }
802 777
803 file = debugfs_create_file("params", 0444, 778 debugfs_create_file("params", 0444, root, hsotg, &params_fops);
804 hsotg->debug_root, 779 debugfs_create_file("hw_params", 0444, root, hsotg, &hw_params_fops);
805 hsotg, &params_fops); 780 debugfs_create_file("dr_mode", 0444, root, hsotg, &dr_mode_fops);
806 if (IS_ERR(file))
807 dev_err(hsotg->dev, "%s: failed to create params\n", __func__);
808
809 file = debugfs_create_file("hw_params", 0444,
810 hsotg->debug_root,
811 hsotg, &hw_params_fops);
812 if (IS_ERR(file))
813 dev_err(hsotg->dev, "%s: failed to create hw_params\n",
814 __func__);
815
816 file = debugfs_create_file("dr_mode", 0444,
817 hsotg->debug_root,
818 hsotg, &dr_mode_fops);
819 if (IS_ERR(file))
820 dev_err(hsotg->dev, "%s: failed to create dr_mode\n", __func__);
821 781
822 /* Add gadget debugfs nodes */ 782 /* Add gadget debugfs nodes */
823 dwc2_hsotg_create_debug(hsotg); 783 dwc2_hsotg_create_debug(hsotg);
@@ -826,24 +786,18 @@ int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)
826 GFP_KERNEL); 786 GFP_KERNEL);
827 if (!hsotg->regset) { 787 if (!hsotg->regset) {
828 ret = -ENOMEM; 788 ret = -ENOMEM;
829 goto err1; 789 goto err;
830 } 790 }
831 791
832 hsotg->regset->regs = dwc2_regs; 792 hsotg->regset->regs = dwc2_regs;
833 hsotg->regset->nregs = ARRAY_SIZE(dwc2_regs); 793 hsotg->regset->nregs = ARRAY_SIZE(dwc2_regs);
834 hsotg->regset->base = hsotg->regs; 794 hsotg->regset->base = hsotg->regs;
835 795
836 file = debugfs_create_regset32("regdump", 0444, hsotg->debug_root, 796 debugfs_create_regset32("regdump", 0444, root, hsotg->regset);
837 hsotg->regset);
838 if (!file) {
839 ret = -ENOMEM;
840 goto err1;
841 }
842 797
843 return 0; 798 return 0;
844err1: 799err:
845 debugfs_remove_recursive(hsotg->debug_root); 800 debugfs_remove_recursive(hsotg->debug_root);
846err0:
847 return ret; 801 return ret;
848} 802}
849 803