summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2022-09-20 09:38:15 +0200
committerVinod Koul <vkoul@kernel.org>2022-09-24 07:29:56 +0200
commitfe2da191f125d299835e0bb299e7b35f68aa26e6 (patch)
tree7a369da5844d6cac47d2f24cc662b4f89c609e4e /drivers/phy
parentphy: qcom-qmp-pcie: drop init and exit wrappers (diff)
downloadlinux-fe2da191f125d299835e0bb299e7b35f68aa26e6.tar.xz
linux-fe2da191f125d299835e0bb299e7b35f68aa26e6.zip
phy: qcom-qmp-usb: drop init and exit wrappers
Drop the unnecessary PHY init and exit callback wrappers. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20220920073826.20811-7-johan+linaro@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/qualcomm/phy-qcom-qmp-usb.c29
1 files changed, 4 insertions, 25 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 03481b6f1c35..a42e13905c15 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -2125,8 +2125,9 @@ static int qmp_usb_serdes_init(struct qmp_phy *qphy)
return 0;
}
-static int qmp_usb_com_init(struct qmp_phy *qphy)
+static int qmp_usb_init(struct phy *phy)
{
+ struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg;
void __iomem *pcs = qphy->pcs;
@@ -2197,8 +2198,9 @@ err_disable_regulators:
return ret;
}
-static int qmp_usb_com_exit(struct qmp_phy *qphy)
+static int qmp_usb_exit(struct phy *phy)
{
+ struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg;
@@ -2211,20 +2213,6 @@ static int qmp_usb_com_exit(struct qmp_phy *qphy)
return 0;
}
-static int qmp_usb_init(struct phy *phy)
-{
- struct qmp_phy *qphy = phy_get_drvdata(phy);
- struct qcom_qmp *qmp = qphy->qmp;
- int ret;
- dev_vdbg(qmp->dev, "Initializing QMP phy\n");
-
- ret = qmp_usb_com_init(qphy);
- if (ret)
- return ret;
-
- return 0;
-}
-
static int qmp_usb_power_on(struct phy *phy)
{
struct qmp_phy *qphy = phy_get_drvdata(phy);
@@ -2316,15 +2304,6 @@ static int qmp_usb_power_off(struct phy *phy)
return 0;
}
-static int qmp_usb_exit(struct phy *phy)
-{
- struct qmp_phy *qphy = phy_get_drvdata(phy);
-
- qmp_usb_com_exit(qphy);
-
- return 0;
-}
-
static int qmp_usb_enable(struct phy *phy)
{
int ret;