From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 29 Sep 2015 10:05:44 +0000 (+0200)
Subject: Revert "HID: debug: Check result of debugfs_create_dir() and debugfs_create_file()"
X-Git-Tag: KARO-TX6UL-2015-11-03~102^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7184d24f3584b86c3ff5d01875d70618043001ab;p=karo-tx-linux.git

Revert "HID: debug: Check result of debugfs_create_dir() and debugfs_create_file()"

This reverts commit 9c537bf6cad4782573d873674a267c7cdc842ac9.

Coccinelle reports:

NULL check before freeing functions like kfree, debugfs_remove,
debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider
reorganizing relevant code to avoid passing NULL values.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
---

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6b5419ee2228..599620811cd8 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2628,10 +2628,8 @@ int hid_add_device(struct hid_device *hdev)
 	ret = device_add(&hdev->dev);
 	if (!ret)
 		hdev->status |= HID_STAT_ADDED;
-	else {
-		if (hdev->debug)
-			hid_debug_unregister(hdev);
-	}
+	else
+		hid_debug_unregister(hdev);
 
 	return ret;
 }
@@ -2675,8 +2673,7 @@ static void hid_remove_device(struct hid_device *hdev)
 {
 	if (hdev->status & HID_STAT_ADDED) {
 		device_del(&hdev->dev);
-		if (hdev->debug)
-			hid_debug_unregister(hdev);
+		hid_debug_unregister(hdev);
 		hdev->status &= ~HID_STAT_ADDED;
 	}
 	kfree(hdev->dev_rdesc);
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 12fe6b62e300..2886b645ced7 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1222,41 +1222,12 @@ static const struct file_operations hid_debug_events_fops = {
 
 void hid_debug_register(struct hid_device *hdev, const char *name)
 {
-	if (!hid_debug_root)
-		goto debugfs_root_error;
-
 	hdev->debug_dir = debugfs_create_dir(name, hid_debug_root);
-
-	if (!hdev->debug_dir) {
-		printk(KERN_WARNING "Could not create '%s' debugfs directory\n",
-			name);
-		return;
-	}
-
 	hdev->debug_rdesc = debugfs_create_file("rdesc", 0400,
 			hdev->debug_dir, hdev, &hid_debug_rdesc_fops);
-	if (!hdev->debug_rdesc) {
-		printk(KERN_WARNING "Could not create rdesc debugfs file\n");
-		goto error;
-	}
-
 	hdev->debug_events = debugfs_create_file("events", 0400,
 			hdev->debug_dir, hdev, &hid_debug_events_fops);
-	if (!hdev->debug_events) {
-		printk(KERN_WARNING "Could not create events debugfs file\n");
-		goto error;
-	}
-
 	hdev->debug = 1;
-
-	return;
-
-error:
-	debugfs_remove_recursive(hdev->debug_dir);
-	return;
-
-debugfs_root_error:
-	return;
 }
 
 void hid_debug_unregister(struct hid_device *hdev)
@@ -1271,13 +1242,10 @@ void hid_debug_unregister(struct hid_device *hdev)
 void hid_debug_init(void)
 {
 	hid_debug_root = debugfs_create_dir("hid", NULL);
-	if (!hid_debug_root)
-		printk(KERN_WARNING "Could not create root 'hid' debugfs directory\n");
 }
 
 void hid_debug_exit(void)
 {
-	if (hid_debug_root)
-		debugfs_remove_recursive(hid_debug_root);
+	debugfs_remove_recursive(hid_debug_root);
 }