From 1543e317f1da31b75942316931e8f491a8920811 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Thu, 04 Jan 2024 10:08:02 +0000
Subject: [PATCH] disable FB
---
kernel/drivers/phy/rockchip/phy-rockchip-inno-usb3.c | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
index dec985d..f345f23 100644
--- a/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
+++ b/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
@@ -141,7 +141,6 @@
struct regmap *grf;
int um_ls_irq;
struct clk *clks[U3PHY_MAX_CLKS];
- struct dentry *root;
struct regulator *vbus;
struct reset_control *rsts[U3PHY_RESET_MAX];
struct rockchip_u3phy_apbcfg apbcfg;
@@ -294,32 +293,13 @@
.release = single_release,
};
-int rockchip_u3phy_debugfs_init(struct rockchip_u3phy *u3phy)
+static void rockchip_u3phy_debugfs_init(struct rockchip_u3phy *u3phy)
{
struct dentry *root;
- struct dentry *file;
- int ret;
root = debugfs_create_dir(dev_name(u3phy->dev), NULL);
- if (!root) {
- ret = -ENOMEM;
- goto err0;
- }
-
- u3phy->root = root;
-
- file = debugfs_create_file("u3phy_mode", 0644, root,
- u3phy, &rockchip_u3phy_usb2_only_fops);
- if (!file) {
- ret = -ENOMEM;
- goto err1;
- }
- return 0;
-
-err1:
- debugfs_remove_recursive(root);
-err0:
- return ret;
+ debugfs_create_file("u3phy_mode", 0644, root,
+ u3phy, &rockchip_u3phy_usb2_only_fops);
}
static const char *get_rest_name(enum rockchip_u3phy_rest_req rst)
@@ -608,7 +588,7 @@
dev_dbg(&u3phy_port->phy->dev, "FS/LS online\n");
break;
}
- /* fall through */
+ fallthrough;
case PHY_UTMI_CONNECT:
if (u3phy_port->suspended) {
dev_dbg(&u3phy_port->phy->dev, "Connected\n");
@@ -933,8 +913,10 @@
}
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
- if (IS_ERR_OR_NULL(provider))
+ if (IS_ERR(provider)) {
+ ret = PTR_ERR(provider);
goto put_child;
+ }
rockchip_u3phy_rest_deassert(u3phy, U3PHY_MAC_RST);
rockchip_u3phy_clk_disable(u3phy);
--
Gitblit v1.6.2