hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c
....@@ -11,7 +11,7 @@
1111 #include <linux/module.h>
1212 #include <linux/pci.h>
1313 #include "bnxt_hsi.h"
14
-#include <linux/net_dim.h>
14
+#include <linux/dim.h>
1515 #include "bnxt.h"
1616 #include "bnxt_debugfs.h"
1717
....@@ -21,7 +21,7 @@
2121 char __user *buffer,
2222 size_t count, loff_t *ppos)
2323 {
24
- struct net_dim *dim = filep->private_data;
24
+ struct dim *dim = filep->private_data;
2525 int len;
2626 char *buf;
2727
....@@ -61,45 +61,30 @@
6161 .read = debugfs_dim_read,
6262 };
6363
64
-static struct dentry *debugfs_dim_ring_init(struct net_dim *dim, int ring_idx,
65
- struct dentry *dd)
64
+static void debugfs_dim_ring_init(struct dim *dim, int ring_idx,
65
+ struct dentry *dd)
6666 {
6767 static char qname[16];
6868
6969 snprintf(qname, 10, "%d", ring_idx);
70
- return debugfs_create_file(qname, 0600, dd,
71
- dim, &debugfs_dim_fops);
70
+ debugfs_create_file(qname, 0600, dd, dim, &debugfs_dim_fops);
7271 }
7372
7473 void bnxt_debug_dev_init(struct bnxt *bp)
7574 {
7675 const char *pname = pci_name(bp->pdev);
77
- struct dentry *pdevf;
76
+ struct dentry *dir;
7877 int i;
7978
8079 bp->debugfs_pdev = debugfs_create_dir(pname, bnxt_debug_mnt);
81
- if (bp->debugfs_pdev) {
82
- pdevf = debugfs_create_dir("dim", bp->debugfs_pdev);
83
- if (!pdevf) {
84
- pr_err("failed to create debugfs entry %s/dim\n",
85
- pname);
86
- return;
87
- }
88
- bp->debugfs_dim = pdevf;
89
- /* create files for each rx ring */
90
- for (i = 0; i < bp->cp_nr_rings; i++) {
91
- struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
80
+ dir = debugfs_create_dir("dim", bp->debugfs_pdev);
9281
93
- if (cpr && bp->bnapi[i]->rx_ring) {
94
- pdevf = debugfs_dim_ring_init(&cpr->dim, i,
95
- bp->debugfs_dim);
96
- if (!pdevf)
97
- pr_err("failed to create debugfs entry %s/dim/%d\n",
98
- pname, i);
99
- }
100
- }
101
- } else {
102
- pr_err("failed to create debugfs entry %s\n", pname);
82
+ /* create files for each rx ring */
83
+ for (i = 0; i < bp->cp_nr_rings; i++) {
84
+ struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring;
85
+
86
+ if (cpr && bp->bnapi[i]->rx_ring)
87
+ debugfs_dim_ring_init(&cpr->dim, i, dir);
10388 }
10489 }
10590
....@@ -114,8 +99,6 @@
11499 void bnxt_debug_init(void)
115100 {
116101 bnxt_debug_mnt = debugfs_create_dir("bnxt_en", NULL);
117
- if (!bnxt_debug_mnt)
118
- pr_err("failed to init bnxt_en debugfs\n");
119102 }
120103
121104 void bnxt_debug_exit(void)