aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366_smi.c164
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366_smi.h11
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366rb.c176
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366s.c177
4 files changed, 193 insertions, 335 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index dacb465946..feb7d2ca94 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -16,6 +16,10 @@
#include <linux/spinlock.h>
#include <linux/skbuff.h>
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+#include <linux/debugfs.h>
+#endif
+
#include "rtl8366_smi.h"
#define RTL8366_SMI_ACK_RETRY_COUNT 5
@@ -484,6 +488,163 @@ int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port, unsigned vid)
}
EXPORT_SYMBOL_GPL(rtl8366_set_pvid);
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+int rtl8366_debugfs_open(struct inode *inode, struct file *file)
+{
+ file->private_data = inode->i_private;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_debugfs_open);
+
+static ssize_t rtl8366_read_debugfs_vlan_mc(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+ int i, len = 0;
+ char *buf = smi->buf;
+
+ len += snprintf(buf + len, sizeof(smi->buf) - len,
+ "%2s %6s %4s %6s %6s %3s\n",
+ "id", "vid","prio", "member", "untag", "fid");
+
+ for (i = 0; i < smi->num_vlan_mc; ++i) {
+ struct rtl8366_vlan_mc vlanmc;
+
+ smi->ops->get_vlan_mc(smi, i, &vlanmc);
+
+ len += snprintf(buf + len, sizeof(smi->buf) - len,
+ "%2d %6d %4d 0x%04x 0x%04x %3d\n",
+ i, vlanmc.vid, vlanmc.priority,
+ vlanmc.member, vlanmc.untag, vlanmc.fid);
+ }
+
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366_read_debugfs_reg(struct file *file,
+ char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+ u32 t, reg = smi->dbg_reg;
+ int err, len = 0;
+ char *buf = smi->buf;
+
+ memset(buf, '\0', sizeof(smi->buf));
+
+ err = rtl8366_smi_read_reg(smi, reg, &t);
+ if (err) {
+ len += snprintf(buf, sizeof(smi->buf),
+ "Read failed (reg: 0x%04x)\n", reg);
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+ }
+
+ len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
+ reg, t);
+
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t rtl8366_write_debugfs_reg(struct file *file,
+ const char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+ unsigned long data;
+ u32 reg = smi->dbg_reg;
+ int err;
+ size_t len;
+ char *buf = smi->buf;
+
+ len = min(count, sizeof(smi->buf) - 1);
+ if (copy_from_user(buf, user_buf, len)) {
+ dev_err(smi->parent, "copy from user failed\n");
+ return -EFAULT;
+ }
+
+ buf[len] = '\0';
+ if (len > 0 && buf[len - 1] == '\n')
+ buf[len - 1] = '\0';
+
+
+ if (strict_strtoul(buf, 16, &data)) {
+ dev_err(smi->parent, "Invalid reg value %s\n", buf);
+ } else {
+ err = rtl8366_smi_write_reg(smi, reg, data);
+ if (err) {
+ dev_err(smi->parent,
+ "writing reg 0x%04x val 0x%04lx failed\n",
+ reg, data);
+ }
+ }
+
+ return count;
+}
+
+static const struct file_operations fops_rtl8366_regs = {
+ .read = rtl8366_read_debugfs_reg,
+ .write = rtl8366_write_debugfs_reg,
+ .open = rtl8366_debugfs_open,
+ .owner = THIS_MODULE
+};
+
+static const struct file_operations fops_rtl8366_vlan_mc = {
+ .read = rtl8366_read_debugfs_vlan_mc,
+ .open = rtl8366_debugfs_open,
+ .owner = THIS_MODULE
+};
+
+static void rtl8366_debugfs_init(struct rtl8366_smi *smi)
+{
+ struct dentry *node;
+ struct dentry *root;
+
+ if (!smi->debugfs_root)
+ smi->debugfs_root = debugfs_create_dir(dev_name(smi->parent),
+ NULL);
+
+ if (!smi->debugfs_root) {
+ dev_err(smi->parent, "Unable to create debugfs dir\n");
+ return;
+ }
+ root = smi->debugfs_root;
+
+ node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root,
+ &smi->dbg_reg);
+ if (!node) {
+ dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+ "reg");
+ return;
+ }
+
+ node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, smi,
+ &fops_rtl8366_regs);
+ if (!node) {
+ dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+ "val");
+ return;
+ }
+
+ node = debugfs_create_file("vlan_mc", S_IRUSR, root, smi,
+ &fops_rtl8366_vlan_mc);
+ if (!node)
+ dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+ "vlan_mc");
+}
+
+static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
+{
+ if (smi->debugfs_root) {
+ debugfs_remove_recursive(smi->debugfs_root);
+ smi->debugfs_root = NULL;
+ }
+}
+#else
+static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
+static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
+#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
+
static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
{
int ret;
@@ -564,6 +725,8 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
if (err)
goto err_free_sck;
+ rtl8366_debugfs_init(smi);
+
return 0;
err_free_sck:
@@ -577,6 +740,7 @@ EXPORT_SYMBOL_GPL(rtl8366_smi_init);
void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
{
+ rtl8366_debugfs_remove(smi);
rtl8366_smi_mii_cleanup(smi);
gpio_free(smi->gpio_sck);
gpio_free(smi->gpio_sda);
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
index 8639553014..3238875966 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.h
@@ -16,6 +16,9 @@
struct rtl8366_smi_ops;
struct rtl8366_vlan_ops;
struct mii_bus;
+struct dentry;
+struct inode;
+struct file;
struct rtl8366_smi {
struct device *parent;
@@ -32,6 +35,10 @@ struct rtl8366_smi {
struct rtl8366_smi_ops *ops;
char buf[4096];
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+ struct dentry *debugfs_root;
+ u16 dbg_reg;
+#endif
};
struct rtl8366_vlan_mc {
@@ -79,4 +86,8 @@ int rtl8366_reset_vlan(struct rtl8366_smi *smi);
int rtl8366_get_pvid(struct rtl8366_smi *smi, int port, int *val);
int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port, unsigned vid);
+#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+int rtl8366_debugfs_open(struct inode *inode, struct file *file);
+#endif
+
#endif /* _RTL8366_SMI_H */
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 0bab80ad95..70063d4867 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -164,9 +164,6 @@ struct rtl8366rb {
struct device *parent;
struct rtl8366_smi smi;
struct switch_dev dev;
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
- struct dentry *debugfs_root;
-#endif
};
struct rtl8366rb_vlan_mc {
@@ -190,10 +187,6 @@ struct rtl8366rb_vlan_4k {
u16 fid:3;
};
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 gl_dbg_reg;
-#endif
-
struct mib_counter {
unsigned offset;
unsigned length;
@@ -685,18 +678,11 @@ static int rtl8366rb_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
}
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366rb_debugfs_open(struct inode *inode, struct file *file)
-{
- file->private_data = inode->i_private;
- return 0;
-}
-
static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos)
{
- struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
+ struct rtl8366_smi *smi = file->private_data;
int i, j, len = 0;
char *buf = smi->buf;
@@ -727,171 +713,28 @@ static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
}
-static ssize_t rtl8366rb_read_debugfs_vlan_mc(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- int i, len = 0;
- char *buf = smi->buf;
-
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%2s %6s %4s %6s %6s %3s\n",
- "id", "vid","prio", "member", "untag", "fid");
-
- for (i = 0; i < RTL8366RB_NUM_VLANS; ++i) {
- struct rtl8366_vlan_mc vlanmc;
-
- rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
-
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%2d %6d %4d 0x%04x 0x%04x %3d\n",
- i, vlanmc.vid, vlanmc.priority,
- vlanmc.member, vlanmc.untag, vlanmc.fid);
- }
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366rb_read_debugfs_reg(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- u32 t, reg = gl_dbg_reg;
- int err, len = 0;
- char *buf = smi->buf;
-
- memset(buf, '\0', sizeof(smi->buf));
-
- err = rtl8366_smi_read_reg(smi, reg, &t);
- if (err) {
- len += snprintf(buf, sizeof(smi->buf),
- "Read failed (reg: 0x%04x)\n", reg);
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- }
-
- len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
- reg, t);
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366rb_write_debugfs_reg(struct file *file,
- const char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- unsigned long data;
- u32 reg = gl_dbg_reg;
- int err;
- size_t len;
- char *buf = smi->buf;
-
- len = min(count, sizeof(smi->buf) - 1);
- if (copy_from_user(buf, user_buf, len)) {
- dev_err(rtl->parent, "copy from user failed\n");
- return -EFAULT;
- }
-
- buf[len] = '\0';
- if (len > 0 && buf[len - 1] == '\n')
- buf[len - 1] = '\0';
-
-
- if (strict_strtoul(buf, 16, &data)) {
- dev_err(rtl->parent, "Invalid reg value %s\n", buf);
- } else {
- err = rtl8366_smi_write_reg(smi, reg, data);
- if (err) {
- dev_err(rtl->parent,
- "writing reg 0x%04x val 0x%04lx failed\n",
- reg, data);
- }
- }
-
- return count;
-}
-
-static const struct file_operations fops_rtl8366rb_regs = {
- .read = rtl8366rb_read_debugfs_reg,
- .write = rtl8366rb_write_debugfs_reg,
- .open = rtl8366rb_debugfs_open,
- .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366rb_vlan_mc = {
- .read = rtl8366rb_read_debugfs_vlan_mc,
- .open = rtl8366rb_debugfs_open,
- .owner = THIS_MODULE
-};
-
static const struct file_operations fops_rtl8366rb_mibs = {
.read = rtl8366rb_read_debugfs_mibs,
- .open = rtl8366rb_debugfs_open,
+ .open = rtl8366_debugfs_open,
.owner = THIS_MODULE
};
-static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl)
+static void rtl8366rb_debugfs_init(struct rtl8366_smi *smi)
{
struct dentry *node;
- struct dentry *root;
-
- if (!rtl->debugfs_root)
- rtl->debugfs_root = debugfs_create_dir("rtl8366rb", NULL);
-
- if (!rtl->debugfs_root) {
- dev_err(rtl->parent, "Unable to create debugfs dir\n");
- return;
- }
- root = rtl->debugfs_root;
- node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &gl_dbg_reg);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "reg");
+ if (!smi->debugfs_root)
return;
- }
-
- node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
- &fops_rtl8366rb_regs);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "val");
- return;
- }
- node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
- &fops_rtl8366rb_vlan_mc);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "vlan_mc");
- return;
- }
-
- node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
+ node = debugfs_create_file("mibs", S_IRUSR, smi->debugfs_root, smi,
&fops_rtl8366rb_mibs);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
+ if (!node)
+ dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
"mibs");
- return;
- }
-}
-
-static void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl)
-{
- if (rtl->debugfs_root) {
- debugfs_remove_recursive(rtl->debugfs_root);
- rtl->debugfs_root = NULL;
- }
}
#else
-static inline void rtl8366rb_debugfs_init(struct rtl8366rb *rtl) {}
-static inline void rtl8366rb_debugfs_remove(struct rtl8366rb *rtl) {}
+static inline void rtl8366rb_debugfs_init(struct rtl8366_smi *smi) {}
#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
static int rtl8366rb_sw_reset_mibs(struct switch_dev *dev,
@@ -1398,7 +1241,7 @@ static int rtl8366rb_setup(struct rtl8366rb *rtl)
struct rtl8366_smi *smi = &rtl->smi;
int ret;
- rtl8366rb_debugfs_init(rtl);
+ rtl8366rb_debugfs_init(smi);
ret = rtl8366rb_reset_chip(smi);
if (ret)
@@ -1548,7 +1391,6 @@ static int __devexit rtl8366rb_remove(struct platform_device *pdev)
if (rtl) {
rtl8366rb_switch_cleanup(rtl);
- rtl8366rb_debugfs_remove(rtl);
platform_set_drvdata(pdev, NULL);
rtl8366_smi_cleanup(&rtl->smi);
kfree(rtl);
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index 6e55ccde6e..df6fe2909e 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -170,9 +170,6 @@ struct rtl8366s {
struct device *parent;
struct rtl8366_smi smi;
struct switch_dev dev;
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
- struct dentry *debugfs_root;
-#endif
};
struct rtl8366s_vlan_mc {
@@ -196,10 +193,6 @@ struct rtl8366s_vlan_4k {
u16 member:6;
};
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
struct mib_counter {
unsigned base;
unsigned offset;
@@ -674,18 +667,11 @@ static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
}
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
- file->private_data = inode->i_private;
- return 0;
-}
-
static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos)
{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
+ struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
int i, j, len = 0;
char *buf = smi->buf;
@@ -716,171 +702,27 @@ static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
}
-static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- int i, len = 0;
- char *buf = smi->buf;
-
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%2s %6s %4s %6s %6s %3s\n",
- "id", "vid","prio", "member", "untag", "fid");
-
- for (i = 0; i < RTL8366S_NUM_VLANS; ++i) {
- struct rtl8366_vlan_mc vlanmc;
-
- rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%2d %6d %4d 0x%04x 0x%04x %3d\n",
- i, vlanmc.vid, vlanmc.priority,
- vlanmc.member, vlanmc.untag, vlanmc.fid);
- }
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_reg(struct file *file,
- char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- u32 t, reg = g_dbg_reg;
- int err, len = 0;
- char *buf = smi->buf;
-
- memset(buf, '\0', sizeof(smi->buf));
-
- err = rtl8366_smi_read_reg(smi, reg, &t);
- if (err) {
- len += snprintf(buf, sizeof(smi->buf),
- "Read failed (reg: 0x%04x)\n", reg);
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- }
-
- len += snprintf(buf, sizeof(smi->buf), "reg = 0x%04x, val = 0x%04x\n",
- reg, t);
-
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_write_debugfs_reg(struct file *file,
- const char __user *user_buf,
- size_t count, loff_t *ppos)
-{
- struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
- struct rtl8366_smi *smi = &rtl->smi;
- unsigned long data;
- u32 reg = g_dbg_reg;
- int err;
- size_t len;
- char *buf = smi->buf;
-
- len = min(count, sizeof(smi->buf) - 1);
- if (copy_from_user(buf, user_buf, len)) {
- dev_err(rtl->parent, "copy from user failed\n");
- return -EFAULT;
- }
-
- buf[len] = '\0';
- if (len > 0 && buf[len - 1] == '\n')
- buf[len - 1] = '\0';
-
-
- if (strict_strtoul(buf, 16, &data)) {
- dev_err(rtl->parent, "Invalid reg value %s\n", buf);
- } else {
- err = rtl8366_smi_write_reg(smi, reg, data);
- if (err) {
- dev_err(rtl->parent,
- "writing reg 0x%04x val 0x%04lx failed\n",
- reg, data);
- }
- }
-
- return count;
-}
-
-static const struct file_operations fops_rtl8366s_regs = {
- .read = rtl8366s_read_debugfs_reg,
- .write = rtl8366s_write_debugfs_reg,
- .open = rtl8366s_debugfs_open,
- .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_vlan_mc = {
- .read = rtl8366s_read_debugfs_vlan_mc,
- .open = rtl8366s_debugfs_open,
- .owner = THIS_MODULE
-};
-
static const struct file_operations fops_rtl8366s_mibs = {
.read = rtl8366s_read_debugfs_mibs,
- .open = rtl8366s_debugfs_open,
+ .open = rtl8366_debugfs_open,
.owner = THIS_MODULE
};
-static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
+static void rtl8366s_debugfs_init(struct rtl8366_smi *smi)
{
struct dentry *node;
- struct dentry *root;
-
- if (!rtl->debugfs_root)
- rtl->debugfs_root = debugfs_create_dir("rtl8366s", NULL);
-
- if (!rtl->debugfs_root) {
- dev_err(rtl->parent, "Unable to create debugfs dir\n");
- return;
- }
- root = rtl->debugfs_root;
- node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &g_dbg_reg);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "reg");
+ if (!smi->debugfs_root)
return;
- }
- node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
- &fops_rtl8366s_regs);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "val");
- return;
- }
-
- node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
- &fops_rtl8366s_vlan_mc);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
- "vlan_mc");
- return;
- }
-
- node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
+ node = debugfs_create_file("mibs", S_IRUSR, smi->debugfs_root, smi,
&fops_rtl8366s_mibs);
- if (!node) {
- dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
+ if (!node)
+ dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
"mibs");
- return;
- }
}
-
-static void rtl8366s_debugfs_remove(struct rtl8366s *rtl)
-{
- if (rtl->debugfs_root) {
- debugfs_remove_recursive(rtl->debugfs_root);
- rtl->debugfs_root = NULL;
- }
-}
-
#else
-static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {}
-static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {}
+static inline void rtl8366s_debugfs_init(struct rtl8366_smi *smi) {}
#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
@@ -1388,7 +1230,7 @@ static int rtl8366s_setup(struct rtl8366s *rtl)
struct rtl8366_smi *smi = &rtl->smi;
int ret;
- rtl8366s_debugfs_init(rtl);
+ rtl8366s_debugfs_init(smi);
ret = rtl8366s_reset_chip(smi);
if (ret)
@@ -1538,7 +1380,6 @@ static int __devexit rtl8366s_remove(struct platform_device *pdev)
if (rtl) {
rtl8366s_switch_cleanup(rtl);
- rtl8366s_debugfs_remove(rtl);
platform_set_drvdata(pdev, NULL);
rtl8366_smi_cleanup(&rtl->smi);
kfree(rtl);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 00:33:12 +0000