Commit a378508d authored by Vivek Gautam's avatar Vivek Gautam Committed by Martin K. Petersen
Browse files

phy: qcom-ufs-qmp-xx: Discard remove callback for drivers. 



remove() callback does a phy_power_off() only over the phy,
and nothing else now.
The phy_power_off() over the generic phy is called from the phy
consumer, and phy provider driver should not explicitly need to
call any phy ops.
So discard the remove callback for qcom-ufs phy platform drivers.

Signed-off-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 300f9677

drivers/phy/phy-qcom-ufs-qmp-14nm.c

+0 −16
Original line number Diff line number Diff line
@@ -163,21 +163,6 @@ out: 
	return err;

}



static int ufs_qcom_phy_qmp_14nm_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct phy *generic_phy = to_phy(dev);

	struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);

	int err = 0;



	err = ufs_qcom_phy_remove(generic_phy, ufs_qcom_phy);

	if (err)

		dev_err(dev, "%s: ufs_qcom_phy_remove failed = %d\n",

			__func__, err);



	return err;

}



static const struct of_device_id ufs_qcom_phy_qmp_14nm_of_match[] = {

	{.compatible = "qcom,ufs-phy-qmp-14nm"},

	{.compatible = "qcom,msm8996-ufs-phy-qmp-14nm"},
@@ -187,7 +172,6 @@ MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_14nm_of_match); 


static struct platform_driver ufs_qcom_phy_qmp_14nm_driver = {

	.probe = ufs_qcom_phy_qmp_14nm_probe,

	.remove = ufs_qcom_phy_qmp_14nm_remove,

	.driver = {

		.of_match_table = ufs_qcom_phy_qmp_14nm_of_match,

		.name = "ufs_qcom_phy_qmp_14nm",

drivers/phy/phy-qcom-ufs-qmp-20nm.c

+0 −16
Original line number Diff line number Diff line
@@ -219,21 +219,6 @@ out: 
	return err;

}



static int ufs_qcom_phy_qmp_20nm_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct phy *generic_phy = to_phy(dev);

	struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);

	int err = 0;



	err = ufs_qcom_phy_remove(generic_phy, ufs_qcom_phy);

	if (err)

		dev_err(dev, "%s: ufs_qcom_phy_remove failed = %d\n",

			__func__, err);



	return err;

}



static const struct of_device_id ufs_qcom_phy_qmp_20nm_of_match[] = {

	{.compatible = "qcom,ufs-phy-qmp-20nm"},

	{},
@@ -242,7 +227,6 @@ MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_20nm_of_match); 


static struct platform_driver ufs_qcom_phy_qmp_20nm_driver = {

	.probe = ufs_qcom_phy_qmp_20nm_probe,

	.remove = ufs_qcom_phy_qmp_20nm_remove,

	.driver = {

		.of_match_table = ufs_qcom_phy_qmp_20nm_of_match,

		.name = "ufs_qcom_phy_qmp_20nm",

drivers/phy/phy-qcom-ufs.c

+0 −9
Original line number Diff line number Diff line
@@ -619,15 +619,6 @@ int ufs_qcom_phy_calibrate_phy(struct phy *generic_phy, bool is_rate_B) 
}

EXPORT_SYMBOL_GPL(ufs_qcom_phy_calibrate_phy);



int ufs_qcom_phy_remove(struct phy *generic_phy,

			struct ufs_qcom_phy *ufs_qcom_phy)

{

	phy_power_off(generic_phy);



	return 0;

}

EXPORT_SYMBOL_GPL(ufs_qcom_phy_remove);



int ufs_qcom_phy_exit(struct phy *generic_phy)

{

	struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy);

CRA Git | Maintained and supported by SUSTech CRA and CCSE