mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: rockchip: inno-combphy: remove redundant param_exped

Browse Source 
The function param_read() and param_exped() do the same thing,
so this patch uses the more general param_read() instead of
the param_exped(), and delete the param_exped() directly.

Change-Id: Ic097069c28a717ff5f70ceaa36a22ea1bd26b76f
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2020-11-04 10:35:05 +08:00
parent d49d6cc83f
commit 432d2aee96
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/phy/rockchip/phy-rockchip-inno-combphy.c
View File

@@ -136,31 +136,13 @@ static inline int param_write(struct regmap *base,
return regmap_write(base, reg->offset, val);
}
static inline bool param_exped(void __iomem *base,
const struct combphy_reg *reg,
unsigned int value)
{
int ret;
unsigned int tmp, orig;
unsigned int mask = GENMASK(reg->bitend, reg->bitstart);
ret = regmap_read(base, reg->offset, &orig);
if (ret)
return false;
tmp = (orig & mask) >> reg->bitstart;
return tmp == value;
}
static ssize_t u3phy_mode_show(struct device *device,
struct device_attribute *attr,
char *buf)
{
struct rockchip_combphy_priv *priv = dev_get_drvdata(device);
if (param_exped(priv->usb_pcie_grf,
&priv->cfg->grfcfg.u3_port_num, 0))
if (param_read(priv->usb_pcie_grf, &priv->cfg->grfcfg.u3_port_num, 0))
return sprintf(buf, "u2\n");
else
return sprintf(buf, "u3\n");
@@ -173,8 +155,7 @@ static ssize_t u3phy_mode_store(struct device *device,
struct rockchip_combphy_priv *priv = dev_get_drvdata(device);
if (!strncmp(buf, "u3", 2) &&
param_exped(priv->usb_pcie_grf,
&priv->cfg->grfcfg.u3_port_num, 0)) {
param_read(priv->usb_pcie_grf, &priv->cfg->grfcfg.u3_port_num, 0)) {
/*
* Enable USB 3.0 rx termination, need to select
* pipe_l0_rxtermination from USB 3.0 controller.
@@ -189,8 +170,8 @@ static ssize_t u3phy_mode_store(struct device *device,
&priv->cfg->grfcfg.u3_port_disable, false);
dev_info(priv->dev, "Set usb3.0 and usb2.0 mode successfully\n");
} else if (!strncmp(buf, "u2", 2) &&
param_exped(priv->usb_pcie_grf,
&priv->cfg->grfcfg.u3_port_num, 1)) {
param_read(priv->usb_pcie_grf,
&priv->cfg->grfcfg.u3_port_num, 1)) {
/*
* Disable USB 3.0 rx termination, need to select
* pipe_l0_rxtermination from grf and remove rx