add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/fs/orangefs/orangefs-debugfs.c
..
..
@@ -64,7 +64,7 @@
64
64
 	__u64 mask2;
65
65
 };
66
66
 
67
-static int orangefs_kernel_debug_init(void);
67
+static void orangefs_kernel_debug_init(void);
68
68
 
69
69
 static int orangefs_debug_help_open(struct inode *, struct file *);
70
70
 static void *help_start(struct seq_file *, loff_t *);
..
..
@@ -99,7 +99,6 @@
99
99
 static char client_debug_string[ORANGEFS_MAX_DEBUG_STRING_LEN];
100
100
 static char client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN];
101
101
 
102
-static struct dentry *help_file_dentry;
103
102
 static struct dentry *client_debug_dentry;
104
103
 static struct dentry *debug_dir;
105
104
 
..
..
@@ -151,10 +150,8 @@
151
150
  * initialize kmod debug operations, create orangefs debugfs dir and
152
151
  * ORANGEFS_KMOD_DEBUG_HELP_FILE.
153
152
  */
154
-int orangefs_debugfs_init(int debug_mask)
153
+void orangefs_debugfs_init(int debug_mask)
155
154
 {
156
-	int rc = -ENOMEM;
157
-
158
155
 	/* convert input debug mask to a 64-bit unsigned integer */
159
156
         orangefs_gossip_debug_mask = (unsigned long long)debug_mask;
160
157
 
..
..
@@ -183,37 +180,21 @@
183
180
 		(unsigned long long)orangefs_gossip_debug_mask);
184
181
 
185
182
 	debug_dir = debugfs_create_dir("orangefs", NULL);
186
-	if (!debug_dir) {
187
-		pr_info("%s: debugfs_create_dir failed.\n", __func__);
188
-		goto out;
189
-	}
190
183
 
191
-	help_file_dentry = debugfs_create_file(ORANGEFS_KMOD_DEBUG_HELP_FILE,
192
-				  0444,
193
-				  debug_dir,
194
-				  debug_help_string,
195
-				  &debug_help_fops);
196
-	if (!help_file_dentry) {
197
-		pr_info("%s: debugfs_create_file failed.\n", __func__);
198
-		goto out;
199
-	}
184
+	debugfs_create_file(ORANGEFS_KMOD_DEBUG_HELP_FILE, 0444, debug_dir,
185
+			    debug_help_string, &debug_help_fops);
200
186
 
201
187
 	orangefs_debug_disabled = 0;
202
188
 
203
-	rc = orangefs_kernel_debug_init();
204
-
205
-out:
206
-
207
-	return rc;
189
+	orangefs_kernel_debug_init();
208
190
 }
209
191
 
210
192
 /*
211
193
  * initialize the kernel-debug file.
212
194
  */
213
-static int orangefs_kernel_debug_init(void)
195
+static void orangefs_kernel_debug_init(void)
214
196
 {
215
197
 	int rc = -ENOMEM;
216
-	struct dentry *ret;
217
198
 	char *k_buffer = NULL;
218
199
 
219
200
 	gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__);
..
..
@@ -230,24 +211,11 @@
230
211
 		pr_info("%s: overflow 1!\n", __func__);
231
212
 	}
232
213
 
233
-	ret = debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE,
234
-				  0444,
235
-				  debug_dir,
236
-				  k_buffer,
237
-				  &kernel_debug_fops);
238
-	if (!ret) {
239
-		pr_info("%s: failed to create %s.\n",
240
-			__func__,
241
-			ORANGEFS_KMOD_DEBUG_FILE);
242
-		goto out;
243
-	}
244
-
245
-	rc = 0;
214
+	debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer,
215
+			    &kernel_debug_fops);
246
216
 
247
217
 out:
248
-
249
218
 	gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: rc:%d:\n", __func__, rc);
250
-	return rc;
251
219
 }
252
220
 
253
221
 
..
..
@@ -354,12 +322,6 @@
354
322
 						  debug_dir,
355
323
 						  c_buffer,
356
324
 						  &kernel_debug_fops);
357
-	if (!client_debug_dentry) {
358
-		pr_info("%s: failed to create updated %s.\n",
359
-			__func__,
360
-			ORANGEFS_CLIENT_DEBUG_FILE);
361
-		goto out;
362
-	}
363
325
 
364
326
 	rc = 0;
365
327
 
..
..
@@ -964,7 +926,7 @@
964
926
 	return ret;
965
927
 }
966
928
 
967
-int orangefs_debugfs_new_client_string(void __user *arg) 
929
+int orangefs_debugfs_new_client_string(void __user *arg)
968
930
 {
969
931
 	int ret;
970
932
 
..
..
@@ -1017,7 +979,7 @@
1017
979
 	return 0;
1018
980
 }
1019
981
 
1020
-int orangefs_debugfs_new_debug(void __user *arg) 
982
+int orangefs_debugfs_new_debug(void __user *arg)
1021
983
 {
1022
984
 	struct dev_mask_info_s mask_info = {0};
1023
985
 	int ret;