@@ -41,7 +41,6 @@ static struct hns3_dbg_dentry_info hns3_dbg_dentry[] = {
41
41
};
42
42
43
43
static int hns3_dbg_bd_file_init (struct hnae3_handle * handle , u32 cmd );
44
- static int hns3_dbg_common_file_init (struct hnae3_handle * handle , u32 cmd );
45
44
static int hns3_dbg_common_init_t1 (struct hnae3_handle * handle , u32 cmd );
46
45
static int hns3_dbg_common_init_t2 (struct hnae3_handle * handle , u32 cmd );
47
46
@@ -163,49 +162,49 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {
163
162
.cmd = HNAE3_DBG_CMD_MNG_TBL ,
164
163
.dentry = HNS3_DBG_DENTRY_COMMON ,
165
164
.buf_len = HNS3_DBG_READ_LEN ,
166
- .init = hns3_dbg_common_file_init ,
165
+ .init = hns3_dbg_common_init_t2 ,
167
166
},
168
167
{
169
168
.name = "loopback" ,
170
169
.cmd = HNAE3_DBG_CMD_LOOPBACK ,
171
170
.dentry = HNS3_DBG_DENTRY_COMMON ,
172
171
.buf_len = HNS3_DBG_READ_LEN ,
173
- .init = hns3_dbg_common_file_init ,
172
+ .init = hns3_dbg_common_init_t2 ,
174
173
},
175
174
{
176
175
.name = "interrupt_info" ,
177
176
.cmd = HNAE3_DBG_CMD_INTERRUPT_INFO ,
178
177
.dentry = HNS3_DBG_DENTRY_COMMON ,
179
178
.buf_len = HNS3_DBG_READ_LEN ,
180
- .init = hns3_dbg_common_file_init ,
179
+ .init = hns3_dbg_common_init_t2 ,
181
180
},
182
181
{
183
182
.name = "reset_info" ,
184
183
.cmd = HNAE3_DBG_CMD_RESET_INFO ,
185
184
.dentry = HNS3_DBG_DENTRY_COMMON ,
186
185
.buf_len = HNS3_DBG_READ_LEN ,
187
- .init = hns3_dbg_common_file_init ,
186
+ .init = hns3_dbg_common_init_t2 ,
188
187
},
189
188
{
190
189
.name = "imp_info" ,
191
190
.cmd = HNAE3_DBG_CMD_IMP_INFO ,
192
191
.dentry = HNS3_DBG_DENTRY_COMMON ,
193
192
.buf_len = HNS3_DBG_READ_LEN ,
194
- .init = hns3_dbg_common_file_init ,
193
+ .init = hns3_dbg_common_init_t2 ,
195
194
},
196
195
{
197
196
.name = "ncl_config" ,
198
197
.cmd = HNAE3_DBG_CMD_NCL_CONFIG ,
199
198
.dentry = HNS3_DBG_DENTRY_COMMON ,
200
199
.buf_len = HNS3_DBG_READ_LEN_128KB ,
201
- .init = hns3_dbg_common_file_init ,
200
+ .init = hns3_dbg_common_init_t2 ,
202
201
},
203
202
{
204
203
.name = "mac_tnl_status" ,
205
204
.cmd = HNAE3_DBG_CMD_MAC_TNL_STATUS ,
206
205
.dentry = HNS3_DBG_DENTRY_COMMON ,
207
206
.buf_len = HNS3_DBG_READ_LEN ,
208
- .init = hns3_dbg_common_file_init ,
207
+ .init = hns3_dbg_common_init_t2 ,
209
208
},
210
209
{
211
210
.name = "bios_common" ,
@@ -317,21 +316,21 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {
317
316
.cmd = HNAE3_DBG_CMD_SERV_INFO ,
318
317
.dentry = HNS3_DBG_DENTRY_COMMON ,
319
318
.buf_len = HNS3_DBG_READ_LEN ,
320
- .init = hns3_dbg_common_file_init ,
319
+ .init = hns3_dbg_common_init_t2 ,
321
320
},
322
321
{
323
322
.name = "vlan_config" ,
324
323
.cmd = HNAE3_DBG_CMD_VLAN_CONFIG ,
325
324
.dentry = HNS3_DBG_DENTRY_COMMON ,
326
325
.buf_len = HNS3_DBG_READ_LEN ,
327
- .init = hns3_dbg_common_file_init ,
326
+ .init = hns3_dbg_common_init_t2 ,
328
327
},
329
328
{
330
329
.name = "ptp_info" ,
331
330
.cmd = HNAE3_DBG_CMD_PTP_INFO ,
332
331
.dentry = HNS3_DBG_DENTRY_COMMON ,
333
332
.buf_len = HNS3_DBG_READ_LEN ,
334
- .init = hns3_dbg_common_file_init ,
333
+ .init = hns3_dbg_common_init_t2 ,
335
334
},
336
335
{
337
336
.name = "fd_counter" ,
@@ -345,7 +344,7 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {
345
344
.cmd = HNAE3_DBG_CMD_UMV_INFO ,
346
345
.dentry = HNS3_DBG_DENTRY_COMMON ,
347
346
.buf_len = HNS3_DBG_READ_LEN ,
348
- .init = hns3_dbg_common_file_init ,
347
+ .init = hns3_dbg_common_init_t2 ,
349
348
},
350
349
{
351
350
.name = "page_pool_info" ,
@@ -986,7 +985,6 @@ static const struct hns3_dbg_func hns3_dbg_cmd_func[] = {
986
985
static int hns3_dbg_read_cmd (struct hns3_dbg_data * dbg_data ,
987
986
enum hnae3_dbg_cmd cmd , char * buf , int len )
988
987
{
989
- const struct hnae3_ae_ops * ops = hns3_get_ops (dbg_data -> handle );
990
988
const struct hns3_dbg_func * cmd_func ;
991
989
u32 i ;
992
990
@@ -1002,10 +1000,7 @@ static int hns3_dbg_read_cmd(struct hns3_dbg_data *dbg_data,
1002
1000
}
1003
1001
}
1004
1002
1005
- if (!ops -> dbg_read_cmd )
1006
- return - EOPNOTSUPP ;
1007
-
1008
- return ops -> dbg_read_cmd (dbg_data -> handle , cmd , buf , len );
1003
+ return - EOPNOTSUPP ;
1009
1004
}
1010
1005
1011
1006
static ssize_t hns3_dbg_read (struct file * filp , char __user * buffer ,
@@ -1090,25 +1085,6 @@ static int hns3_dbg_bd_file_init(struct hnae3_handle *handle, u32 cmd)
1090
1085
return 0 ;
1091
1086
}
1092
1087
1093
- static int
1094
- hns3_dbg_common_file_init (struct hnae3_handle * handle , u32 cmd )
1095
- {
1096
- struct hns3_dbg_data * data ;
1097
- struct dentry * entry_dir ;
1098
-
1099
- data = devm_kzalloc (& handle -> pdev -> dev , sizeof (* data ), GFP_KERNEL );
1100
- if (!data )
1101
- return - ENOMEM ;
1102
-
1103
- data -> handle = handle ;
1104
- data -> cmd = hns3_dbg_cmd [cmd ].cmd ;
1105
- entry_dir = hns3_dbg_dentry [hns3_dbg_cmd [cmd ].dentry ].dentry ;
1106
- debugfs_create_file (hns3_dbg_cmd [cmd ].name , 0400 , entry_dir ,
1107
- data , & hns3_dbg_fops );
1108
-
1109
- return 0 ;
1110
- }
1111
-
1112
1088
static int hns3_dbg_common_init_t1 (struct hnae3_handle * handle , u32 cmd )
1113
1089
{
1114
1090
struct device * dev = & handle -> pdev -> dev ;
0 commit comments