phy: remove the old lookup method
Subsystems (7)
PATCH 1/1 phy: remove the old lookup method
From: Heikki Krogerus <[email protected]>
The users of the old method are now converted to the new one.
[ [email protected] : made phy-berlin-usb.c and phy-miphy28lp.c to use the updated
devm_phy_create API.]
---
Two new PHY drivers phy-berlin-usb.c and phy-miphy28lp.c were added which was using the old devm_phy_create signature. Made it to use the new devm_phy_create signatiure.
drivers/phy/phy-bcm-kona-usb2.c | 2 +- drivers/phy/phy-berlin-sata.c | 2 +- drivers/phy/phy-berlin-usb.c | 3 +-- drivers/phy/phy-core.c | 49 +++------------------------------- drivers/phy/phy-exynos-dp-video.c | 2 +- drivers/phy/phy-exynos-mipi-video.c | 2 +- drivers/phy/phy-exynos5-usbdrd.c | 3 +-- drivers/phy/phy-exynos5250-sata.c | 2 +- drivers/phy/phy-hix5hd2-sata.c | 2 +- drivers/phy/phy-miphy28lp.c | 2 +- drivers/phy/phy-miphy365x.c | 2 +- drivers/phy/phy-mvebu-sata.c | 2 +- drivers/phy/phy-omap-usb2.c | 2 +- drivers/phy/phy-qcom-apq8064-sata.c | 3 +-- drivers/phy/phy-qcom-ipq806x-sata.c | 3 +-- drivers/phy/phy-rcar-gen2.c | 2 +- drivers/phy/phy-samsung-usb2.c | 3 +-- drivers/phy/phy-spear1310-miphy.c | 2 +- drivers/phy/phy-spear1340-miphy.c | 2 +- drivers/phy/phy-stih407-usb.c | 2 +- drivers/phy/phy-stih41x-usb.c | 2 +- drivers/phy/phy-sun4i-usb.c | 2 +- drivers/phy/phy-ti-pipe3.c | 2 +- drivers/phy/phy-twl4030-usb.c | 2 +- drivers/phy/phy-xgene.c | 2 +- drivers/pinctrl/pinctrl-tegra-xusb.c | 4 +-- include/linux/phy/phy.h | 38 +++----------------------- 27 files changed, 34 insertions(+), 110 deletions(-)
drivers/phy/phy-bcm-kona-usb2.c +1 -1
@@ -117,7 +117,7 @@ static int bcm_kona_usb2_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy); - gphy =devm_phy_create (dev,NULL , &ops,NULL ); + gphy =devm_phy_create (dev,NULL , &ops);if (IS_ERR (gphy))return PTR_ERR (gphy);
drivers/phy/phy-berlin-sata.c +1 -1
@@ -249,7 +249,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)if (!phy_desc)return -ENOMEM ; - phy =devm_phy_create (dev,NULL , &phy_berlin_sata_ops,NULL ); + phy =devm_phy_create (dev,NULL , &phy_berlin_sata_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY %d\n" , phy_id);return PTR_ERR (phy);
drivers/phy/phy-berlin-usb.c +1 -2
@@ -192,8 +192,7 @@ static int phy_berlin_usb_probe(struct platform_device *pdev) priv->pll_divider = *((u32 *)match->data); - priv->phy =devm_phy_create (&pdev->dev,NULL , &phy_berlin_usb_ops, -NULL ); + priv->phy =devm_phy_create (&pdev->dev,NULL , &phy_berlin_usb_ops);if (IS_ERR (priv->phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (priv->phy);
drivers/phy/phy-core.c +4 -45
101 lines not on this page · raw message
drivers/phy/phy-exynos-dp-video.c +1 -1
@@ -112,7 +112,7 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev) match =of_match_node (exynos_dp_video_phy_of_match, dev->of_node); state->drvdata = match->data; - phy =devm_phy_create (dev,NULL , &exynos_dp_video_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &exynos_dp_video_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create Display Port PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-exynos-mipi-video.c +1 -1
@@ -137,7 +137,7 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev)for (i =0 ; i <EXYNOS_MIPI_PHYS_NUM ; i++) {struct phy *phy =devm_phy_create (dev,NULL , - &exynos_mipi_video_phy_ops,NULL ); + &exynos_mipi_video_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY %d\n" , i);return PTR_ERR (phy);
drivers/phy/phy-exynos5-usbdrd.c +1 -2
@@ -637,8 +637,7 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)for (i =0 ; i <EXYNOS5_DRDPHYS_NUM ; i++) {struct phy *phy =devm_phy_create (dev,NULL , - &exynos5_usbdrd_phy_ops, -NULL ); + &exynos5_usbdrd_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"Failed to create usbdrd_phy phy\n" );return PTR_ERR (phy);
drivers/phy/phy-exynos5250-sata.c +1 -1
@@ -210,7 +210,7 @@ static int exynos_sata_phy_probe(struct platform_device *pdev)return ret; } - sata_phy->phy =devm_phy_create (dev,NULL , &exynos_sata_phy_ops,NULL ); + sata_phy->phy =devm_phy_create (dev,NULL , &exynos_sata_phy_ops);if (IS_ERR (sata_phy->phy)) {clk_disable_unprepare (sata_phy->phyclk);dev_err (dev,"failed to create PHY\n" );
drivers/phy/phy-hix5hd2-sata.c +1 -1
@@ -156,7 +156,7 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (priv->peri_ctrl)) priv->peri_ctrl =NULL ; - phy =devm_phy_create (dev,NULL , &hix5hd2_sata_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &hix5hd2_sata_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-miphy28lp.c +1 -1
@@ -1231,7 +1231,7 @@ static int miphy28lp_probe(struct platform_device *pdev) miphy_dev->phys[port] = miphy_phy; - phy =devm_phy_create (&pdev->dev, child, &miphy28lp_ops,NULL ); + phy =devm_phy_create (&pdev->dev, child, &miphy28lp_ops);if (IS_ERR (phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-miphy365x.c +1 -1
@@ -593,7 +593,7 @@ static int miphy365x_probe(struct platform_device *pdev) miphy_dev->phys[port] = miphy_phy; - phy =devm_phy_create (&pdev->dev, child, &miphy365x_ops,NULL ); + phy =devm_phy_create (&pdev->dev, child, &miphy365x_ops);if (IS_ERR (phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-mvebu-sata.c +1 -1
@@ -101,7 +101,7 @@ static int phy_mvebu_sata_probe(struct platform_device *pdev)if (IS_ERR (priv->clk))return PTR_ERR (priv->clk); - phy =devm_phy_create (&pdev->dev,NULL , &phy_mvebu_sata_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &phy_mvebu_sata_ops);if (IS_ERR (phy))return PTR_ERR (phy);
drivers/phy/phy-omap-usb2.c +1 -1
@@ -260,7 +260,7 @@ static int omap_usb2_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy);pm_runtime_enable (phy->dev); - generic_phy =devm_phy_create (phy->dev,NULL , &ops,NULL ); + generic_phy =devm_phy_create (phy->dev,NULL , &ops);if (IS_ERR (generic_phy)) {pm_runtime_disable (phy->dev);return PTR_ERR (generic_phy);
drivers/phy/phy-qcom-apq8064-sata.c +1 -2
@@ -228,8 +228,7 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (phy->mmio))return PTR_ERR (phy->mmio); - generic_phy =devm_phy_create (dev,NULL , &qcom_apq8064_sata_phy_ops, -NULL ); + generic_phy =devm_phy_create (dev,NULL , &qcom_apq8064_sata_phy_ops);if (IS_ERR (generic_phy)) {dev_err (dev,"%s: failed to create phy\n" , __func__);return PTR_ERR (generic_phy);
drivers/phy/phy-qcom-ipq806x-sata.c +1 -2
@@ -150,8 +150,7 @@ static int qcom_ipq806x_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (phy->mmio))return PTR_ERR (phy->mmio); - generic_phy =devm_phy_create (dev,NULL , &qcom_ipq806x_sata_phy_ops, -NULL ); + generic_phy =devm_phy_create (dev,NULL , &qcom_ipq806x_sata_phy_ops);if (IS_ERR (generic_phy)) {dev_err (dev,"%s: failed to create phy\n" , __func__);return PTR_ERR (generic_phy);
drivers/phy/phy-rcar-gen2.c +1 -1
@@ -304,7 +304,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) phy->select_value = select_value[channel_num][n]; phy->phy =devm_phy_create (dev,NULL , - &rcar_gen2_phy_ops,NULL ); + &rcar_gen2_phy_ops);if (IS_ERR (phy->phy)) {dev_err (dev,"Failed to create PHY\n" );return PTR_ERR (phy->phy);
drivers/phy/phy-samsung-usb2.c +1 -2
@@ -202,8 +202,7 @@ static int samsung_usb2_phy_probe(struct platform_device *pdev)struct samsung_usb2_phy_instance *p = &drv->instances[i];dev_dbg (dev,"Creating phy \"%s\"\n" , label); - p->phy =devm_phy_create (dev,NULL , &samsung_usb2_phy_ops, -NULL ); + p->phy =devm_phy_create (dev,NULL , &samsung_usb2_phy_ops);if (IS_ERR (p->phy)) {dev_err (drv->dev,"Failed to create usb2_phy \"%s\"\n" , label);
drivers/phy/phy-spear1310-miphy.c +1 -1
@@ -227,7 +227,7 @@ static int spear1310_miphy_probe(struct platform_device *pdev)return -EINVAL ; } - priv->phy =devm_phy_create (dev,NULL , &spear1310_miphy_ops,NULL ); + priv->phy =devm_phy_create (dev,NULL , &spear1310_miphy_ops);if (IS_ERR (priv->phy)) {dev_err (dev,"failed to create SATA PCIe PHY\n" );return PTR_ERR (priv->phy);
drivers/phy/phy-spear1340-miphy.c +1 -1
@@ -259,7 +259,7 @@ static int spear1340_miphy_probe(struct platform_device *pdev)return PTR_ERR (priv->misc); } - priv->phy =devm_phy_create (dev,NULL , &spear1340_miphy_ops,NULL ); + priv->phy =devm_phy_create (dev,NULL , &spear1340_miphy_ops);if (IS_ERR (priv->phy)) {dev_err (dev,"failed to create SATA PCIe PHY\n" );return PTR_ERR (priv->phy);
drivers/phy/phy-stih407-usb.c +1 -1
@@ -137,7 +137,7 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev) } phy_dev->param = res->start; - phy =devm_phy_create (dev,NULL , &stih407_usb2_picophy_data,NULL ); + phy =devm_phy_create (dev,NULL , &stih407_usb2_picophy_data);if (IS_ERR (phy)) {dev_err (dev,"failed to create Display Port PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-stih41x-usb.c +1 -1
@@ -148,7 +148,7 @@ static int stih41x_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (phy_dev->clk); } - phy =devm_phy_create (dev,NULL , &stih41x_usb_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &stih41x_usb_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create phy\n" );
drivers/phy/phy-sun4i-usb.c +1 -1
@@ -298,7 +298,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (phy->pmu); } - phy->phy =devm_phy_create (dev,NULL , &sun4i_usb_phy_ops,NULL ); + phy->phy =devm_phy_create (dev,NULL , &sun4i_usb_phy_ops);if (IS_ERR (phy->phy)) {dev_err (dev,"failed to create PHY %d\n" , i);return PTR_ERR (phy->phy);
drivers/phy/phy-ti-pipe3.c +1 -1
@@ -399,7 +399,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy);pm_runtime_enable (phy->dev); - generic_phy =devm_phy_create (phy->dev,NULL , &ops,NULL ); + generic_phy =devm_phy_create (phy->dev,NULL , &ops);if (IS_ERR (generic_phy))return PTR_ERR (generic_phy);
drivers/phy/phy-twl4030-usb.c +1 -1
@@ -678,7 +678,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral; - phy =devm_phy_create (twl->dev,NULL , &ops,NULL ); + phy =devm_phy_create (twl->dev,NULL , &ops);if (IS_ERR (phy)) {dev_dbg (&pdev->dev,"Failed to create PHY\n" );return PTR_ERR (phy);
drivers/phy/phy-xgene.c +1 -1
@@ -1707,7 +1707,7 @@ static int xgene_phy_probe(struct platform_device *pdev) ctx->dev = &pdev->dev;platform_set_drvdata (pdev, ctx); - ctx->phy =devm_phy_create (ctx->dev,NULL , &xgene_phy_ops,NULL ); + ctx->phy =devm_phy_create (ctx->dev,NULL , &xgene_phy_ops);if (IS_ERR (ctx->phy)) {dev_dbg (&pdev->dev,"Failed to create PHY\n" ); rc =PTR_ERR (ctx->phy);
drivers/pinctrl/pinctrl-tegra-xusb.c +2 -2
@@ -910,7 +910,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) goto reset; } - phy =devm_phy_create (&pdev->dev,NULL , &pcie_phy_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &pcie_phy_ops);if (IS_ERR (phy)) { err =PTR_ERR (phy); goto unregister;
@@ -919,7 +919,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) padctl->phys[TEGRA_XUSB_PADCTL_PCIE ] = phy;phy_set_drvdata (phy, padctl); - phy =devm_phy_create (&pdev->dev,NULL , &sata_phy_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &sata_phy_ops);if (IS_ERR (phy)) { err =PTR_ERR (phy); goto unregister;
include/linux/phy/phy.h +4 -34
@@ -61,7 +61,6 @@ struct phy {struct device dev;int id;const struct phy_ops *ops; -struct phy_init_data *init_data;struct mutex mutex;int init_count;int power_count;
@@ -84,32 +83,6 @@ struct phy_provider { struct of_phandle_args *args); }; -/** -* struct phy_consumer - represents the phy consumer -* @dev_name: the device name of the controller that will use this PHY device -* @port: name given to the consumer port -*/ -struct phy_consumer { -const char *dev_name; -const char *port; -}; - -/** -* struct phy_init_data - contains the list of PHY consumers -* @num_consumers: number of consumers for this PHY device -* @consumers: list of PHY consumers -*/ -struct phy_init_data { -unsigned int num_consumers; -struct phy_consumer *consumers; -}; - -#define PHY_CONSUMER (_dev_name, _port) \ -{ \ - .dev_name = _dev_name, \ - .port = _port, \ -} -struct phy_lookup {struct list_head node;const char *dev_id;
@@ -166,10 +139,9 @@ struct phy *of_phy_get(struct device_node *np, const char *con_id);struct phy *of_phy_simple_xlate (struct device *dev,struct of_phandle_args *args);struct phy *phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data); +const struct phy_ops *ops);struct phy *devm_phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops,struct phy_init_data *init_data); +const struct phy_ops *ops);void phy_destroy (struct phy *phy);void devm_phy_destroy (struct device *dev,struct phy *phy); struct phy_provider *__of_phy_provider_register(struct device *dev,
@@ -310,16 +282,14 @@ static inline struct phy *of_phy_simple_xlate(struct device *dev,static inline struct phy *phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {return ERR_PTR (-ENOSYS ); }static inline struct phy *devm_phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {return ERR_PTR (-ENOSYS ); }
Signature · 1 line
1.7.9.5
Hi Linus, Thierry,
Quoted 3 lines · Kishon Vijay Abraham I
From: Heikki Krogerus <[email protected]>
The users of the old method are now converted to the new one.
One of the files in pinctrl is being modified in this patch to use the new devm_phy_create signature. I'm merging this in my linux-phy tree. If you see any problems please let me know.
Thanks
Kishon
Quoted 568 lines
Signed-off-by Heikki Krogerus <[email protected]>[ [email protected] : made
phy-berlin-usb.candphy-miphy28lp.cto use the updated
devm_phy_createAPI.]Signed-off-by Kishon Vijay Abraham I <[email protected]>---
Two new PHY driversphy-berlin-usb.candphy-miphy28lp.cwere added which was using the olddevm_phy_createsignature. Made it to use the newdevm_phy_createsignatiure.drivers/phy/phy-bcm-kona-usb2.c | 2 +- drivers/phy/phy-berlin-sata.c | 2 +- drivers/phy/phy-berlin-usb.c | 3 +-- drivers/phy/phy-core.c | 49 +++------------------------------- drivers/phy/phy-exynos-dp-video.c | 2 +- drivers/phy/phy-exynos-mipi-video.c | 2 +- drivers/phy/phy-exynos5-usbdrd.c | 3 +-- drivers/phy/phy-exynos5250-sata.c | 2 +- drivers/phy/phy-hix5hd2-sata.c | 2 +- drivers/phy/phy-miphy28lp.c | 2 +- drivers/phy/phy-miphy365x.c | 2 +- drivers/phy/phy-mvebu-sata.c | 2 +- drivers/phy/phy-omap-usb2.c | 2 +- drivers/phy/phy-qcom-apq8064-sata.c | 3 +-- drivers/phy/phy-qcom-ipq806x-sata.c | 3 +-- drivers/phy/phy-rcar-gen2.c | 2 +- drivers/phy/phy-samsung-usb2.c | 3 +-- drivers/phy/phy-spear1310-miphy.c | 2 +- drivers/phy/phy-spear1340-miphy.c | 2 +- drivers/phy/phy-stih407-usb.c | 2 +- drivers/phy/phy-stih41x-usb.c | 2 +- drivers/phy/phy-sun4i-usb.c | 2 +- drivers/phy/phy-ti-pipe3.c | 2 +- drivers/phy/phy-twl4030-usb.c | 2 +- drivers/phy/phy-xgene.c | 2 +- drivers/pinctrl/pinctrl-tegra-xusb.c | 4 +-- include/linux/phy/phy.h | 38 +++----------------------- 27 files changed, 34 insertions(+), 110 deletions(-)drivers/phy/phy-bcm-kona-usb2.c +1
-1@@ -117,7 +117,7 @@ static int bcm_kona_usb2_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy); - gphy =devm_phy_create (dev,NULL , &ops,NULL ); + gphy =devm_phy_create (dev,NULL , &ops);if (IS_ERR (gphy))return PTR_ERR (gphy);drivers/phy/phy-berlin-sata.c +1
-1@@ -249,7 +249,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)if (!phy_desc)return -ENOMEM ; - phy =devm_phy_create (dev,NULL , &phy_berlin_sata_ops,NULL ); + phy =devm_phy_create (dev,NULL , &phy_berlin_sata_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY %d\n" , phy_id);return PTR_ERR (phy);drivers/phy/phy-berlin-usb.c +1
-2@@ -192,8 +192,7 @@ static int phy_berlin_usb_probe(struct platform_device *pdev) priv->pll_divider = *((u32 *)match->data); - priv->phy =devm_phy_create (&pdev->dev,NULL , &phy_berlin_usb_ops, -NULL ); + priv->phy =devm_phy_create (&pdev->dev,NULL , &phy_berlin_usb_ops);if (IS_ERR (priv->phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (priv->phy);drivers/phy/phy-core.c +4
-45@@ -55,36 +55,6 @@ static int devm_phy_match(struct device *dev, void *res, void *match_data)return res == match_data; } -static struct phy *phy_lookup (struct device *device,const char *port) -{ -unsigned int count; -struct phy *phy; -struct device *dev; -struct phy_consumer *consumers; -struct class_dev_iter iter; - -class_dev_iter_init (&iter, phy_class,NULL ,NULL ); -while ((dev =class_dev_iter_next (&iter))) { - phy =to_phy (dev); - -if (!phy->init_data) -continue ; - count = phy->init_data->num_consumers; - consumers = phy->init_data->consumers; -while (count--) { -if (!strcmp (consumers->dev_name,dev_name (device)) && - !strcmp (consumers->port, port)) { -class_dev_iter_exit (&iter); -return phy; - } - consumers++; - } - } - -class_dev_iter_exit (&iter); -return ERR_PTR (-ENODEV ); -} -/** * phy_create_lookup() - allocate and register PHY/device association * @phy: the phy of the association @@ -148,7 +118,6 @@ static struct phy *phy_find(struct device *dev, const char *con_id) {const char *dev_id =dev_name (dev);struct phy_lookup *p, *pl =NULL ; -struct phy *phy;mutex_lock (&phy_provider_mutex);list_for_each_entry (p, &phys, node)@@ -158,12 +127,7 @@ static struct phy *phy_find(struct device *dev, const char *con_id) }mutex_unlock (&phy_provider_mutex); - phy = pl ? pl->phy :ERR_PTR (-ENODEV ); - -/* fall-back to the old lookup method for now */ -if (IS_ERR (phy)) - phy =phy_lookup (dev, con_id); -return phy; +return pl ? pl->phy :ERR_PTR (-ENODEV ); }static struct phy_provider *of_phy_provider_lookup (struct device_node *node)@@ -662,13 +626,11 @@ EXPORT_SYMBOL_GPL(devm_of_phy_get);* @dev: device that is creating the new phy * @node: device node of the phy * @ops: function pointers for performing phy operations -* @init_data: contains the list of PHY consumers or NULL * * Called to create a phy using phy framework. */ struct phy *phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {int ret;int id;@@ -706,7 +668,6 @@ struct phy *phy_create(struct device *dev, struct device_node *node, phy->dev.of_node = node ?: dev->of_node; phy->id = id; phy->ops = ops; - phy->init_data = init_data; ret =dev_set_name (&phy->dev,"phy-%s.%d" ,dev_name (dev), id);if (ret)@@ -741,7 +702,6 @@ EXPORT_SYMBOL_GPL(phy_create);* @dev: device that is creating the new phy * @node: device node of the phy * @ops: function pointers for performing phy operations -* @init_data: contains the list of PHY consumers or NULL * * Creates a new PHY device adding it to the PHY class. * While at that, it also associates the device with the phy using devres. @@ -749,8 +709,7 @@ EXPORT_SYMBOL_GPL(phy_create);* then, devres data is freed. */ struct phy *devm_phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {struct phy **ptr, *phy;@@ -758,7 +717,7 @@ struct phy *devm_phy_create(struct device *dev, struct device_node *node,if (!ptr)return ERR_PTR (-ENOMEM ); - phy =phy_create (dev, node, ops, init_data); + phy =phy_create (dev, node, ops);if (!IS_ERR (phy)) { *ptr = phy;devres_add (dev, ptr);drivers/phy/phy-exynos-dp-video.c +1
-1@@ -112,7 +112,7 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev) match =of_match_node (exynos_dp_video_phy_of_match, dev->of_node); state->drvdata = match->data; - phy =devm_phy_create (dev,NULL , &exynos_dp_video_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &exynos_dp_video_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create Display Port PHY\n" );return PTR_ERR (phy);drivers/phy/phy-exynos-mipi-video.c +1
-1@@ -137,7 +137,7 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev)for (i =0 ; i <EXYNOS_MIPI_PHYS_NUM ; i++) {struct phy *phy =devm_phy_create (dev,NULL , - &exynos_mipi_video_phy_ops,NULL ); + &exynos_mipi_video_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY %d\n" , i);return PTR_ERR (phy);drivers/phy/phy-exynos5-usbdrd.c +1
-2@@ -637,8 +637,7 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev)for (i =0 ; i <EXYNOS5_DRDPHYS_NUM ; i++) {struct phy *phy =devm_phy_create (dev,NULL , - &exynos5_usbdrd_phy_ops, -NULL ); + &exynos5_usbdrd_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"Failed to create usbdrd_phy phy\n" );return PTR_ERR (phy);drivers/phy/phy-exynos5250-sata.c +1
-1@@ -210,7 +210,7 @@ static int exynos_sata_phy_probe(struct platform_device *pdev)return ret; } - sata_phy->phy =devm_phy_create (dev,NULL , &exynos_sata_phy_ops,NULL ); + sata_phy->phy =devm_phy_create (dev,NULL , &exynos_sata_phy_ops);if (IS_ERR (sata_phy->phy)) {clk_disable_unprepare (sata_phy->phyclk);dev_err (dev,"failed to create PHY\n" );drivers/phy/phy-hix5hd2-sata.c +1
-1@@ -156,7 +156,7 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (priv->peri_ctrl)) priv->peri_ctrl =NULL ; - phy =devm_phy_create (dev,NULL , &hix5hd2_sata_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &hix5hd2_sata_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create PHY\n" );return PTR_ERR (phy);drivers/phy/phy-miphy28lp.c +1
-1@@ -1231,7 +1231,7 @@ static int miphy28lp_probe(struct platform_device *pdev) miphy_dev->phys[port] = miphy_phy; - phy =devm_phy_create (&pdev->dev, child, &miphy28lp_ops,NULL ); + phy =devm_phy_create (&pdev->dev, child, &miphy28lp_ops);if (IS_ERR (phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (phy);drivers/phy/phy-miphy365x.c +1
-1@@ -593,7 +593,7 @@ static int miphy365x_probe(struct platform_device *pdev) miphy_dev->phys[port] = miphy_phy; - phy =devm_phy_create (&pdev->dev, child, &miphy365x_ops,NULL ); + phy =devm_phy_create (&pdev->dev, child, &miphy365x_ops);if (IS_ERR (phy)) {dev_err (&pdev->dev,"failed to create PHY\n" );return PTR_ERR (phy);drivers/phy/phy-mvebu-sata.c +1
-1@@ -101,7 +101,7 @@ static int phy_mvebu_sata_probe(struct platform_device *pdev)if (IS_ERR (priv->clk))return PTR_ERR (priv->clk); - phy =devm_phy_create (&pdev->dev,NULL , &phy_mvebu_sata_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &phy_mvebu_sata_ops);if (IS_ERR (phy))return PTR_ERR (phy);drivers/phy/phy-omap-usb2.c +1
-1@@ -260,7 +260,7 @@ static int omap_usb2_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy);pm_runtime_enable (phy->dev); - generic_phy =devm_phy_create (phy->dev,NULL , &ops,NULL ); + generic_phy =devm_phy_create (phy->dev,NULL , &ops);if (IS_ERR (generic_phy)) {pm_runtime_disable (phy->dev);return PTR_ERR (generic_phy);drivers/phy/phy-qcom-apq8064-sata.c +1
-2@@ -228,8 +228,7 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (phy->mmio))return PTR_ERR (phy->mmio); - generic_phy =devm_phy_create (dev,NULL , &qcom_apq8064_sata_phy_ops, -NULL ); + generic_phy =devm_phy_create (dev,NULL , &qcom_apq8064_sata_phy_ops);if (IS_ERR (generic_phy)) {dev_err (dev,"%s: failed to create phy\n" , __func__);return PTR_ERR (generic_phy);drivers/phy/phy-qcom-ipq806x-sata.c +1
-2@@ -150,8 +150,7 @@ static int qcom_ipq806x_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (phy->mmio))return PTR_ERR (phy->mmio); - generic_phy =devm_phy_create (dev,NULL , &qcom_ipq806x_sata_phy_ops, -NULL ); + generic_phy =devm_phy_create (dev,NULL , &qcom_ipq806x_sata_phy_ops);if (IS_ERR (generic_phy)) {dev_err (dev,"%s: failed to create phy\n" , __func__);return PTR_ERR (generic_phy);drivers/phy/phy-rcar-gen2.c +1
-1@@ -304,7 +304,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) phy->select_value = select_value[channel_num][n]; phy->phy =devm_phy_create (dev,NULL , - &rcar_gen2_phy_ops,NULL ); + &rcar_gen2_phy_ops);if (IS_ERR (phy->phy)) {dev_err (dev,"Failed to create PHY\n" );return PTR_ERR (phy->phy);drivers/phy/phy-samsung-usb2.c +1
-2@@ -202,8 +202,7 @@ static int samsung_usb2_phy_probe(struct platform_device *pdev)struct samsung_usb2_phy_instance *p = &drv->instances[i];dev_dbg (dev,"Creating phy \"%s\"\n" , label); - p->phy =devm_phy_create (dev,NULL , &samsung_usb2_phy_ops, -NULL ); + p->phy =devm_phy_create (dev,NULL , &samsung_usb2_phy_ops);if (IS_ERR (p->phy)) {dev_err (drv->dev,"Failed to create usb2_phy \"%s\"\n" , label);drivers/phy/phy-spear1310-miphy.c +1
-1@@ -227,7 +227,7 @@ static int spear1310_miphy_probe(struct platform_device *pdev)return -EINVAL ; } - priv->phy =devm_phy_create (dev,NULL , &spear1310_miphy_ops,NULL ); + priv->phy =devm_phy_create (dev,NULL , &spear1310_miphy_ops);if (IS_ERR (priv->phy)) {dev_err (dev,"failed to create SATA PCIe PHY\n" );return PTR_ERR (priv->phy);drivers/phy/phy-spear1340-miphy.c +1
-1@@ -259,7 +259,7 @@ static int spear1340_miphy_probe(struct platform_device *pdev)return PTR_ERR (priv->misc); } - priv->phy =devm_phy_create (dev,NULL , &spear1340_miphy_ops,NULL ); + priv->phy =devm_phy_create (dev,NULL , &spear1340_miphy_ops);if (IS_ERR (priv->phy)) {dev_err (dev,"failed to create SATA PCIe PHY\n" );return PTR_ERR (priv->phy);drivers/phy/phy-stih407-usb.c +1
-1@@ -137,7 +137,7 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev) } phy_dev->param = res->start; - phy =devm_phy_create (dev,NULL , &stih407_usb2_picophy_data,NULL ); + phy =devm_phy_create (dev,NULL , &stih407_usb2_picophy_data);if (IS_ERR (phy)) {dev_err (dev,"failed to create Display Port PHY\n" );return PTR_ERR (phy);drivers/phy/phy-stih41x-usb.c +1
-1@@ -148,7 +148,7 @@ static int stih41x_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (phy_dev->clk); } - phy =devm_phy_create (dev,NULL , &stih41x_usb_phy_ops,NULL ); + phy =devm_phy_create (dev,NULL , &stih41x_usb_phy_ops);if (IS_ERR (phy)) {dev_err (dev,"failed to create phy\n" );drivers/phy/phy-sun4i-usb.c +1
-1@@ -298,7 +298,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (phy->pmu); } - phy->phy =devm_phy_create (dev,NULL , &sun4i_usb_phy_ops,NULL ); + phy->phy =devm_phy_create (dev,NULL , &sun4i_usb_phy_ops);if (IS_ERR (phy->phy)) {dev_err (dev,"failed to create PHY %d\n" , i);return PTR_ERR (phy->phy);drivers/phy/phy-ti-pipe3.c +1
-1@@ -399,7 +399,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)platform_set_drvdata (pdev, phy);pm_runtime_enable (phy->dev); - generic_phy =devm_phy_create (phy->dev,NULL , &ops,NULL ); + generic_phy =devm_phy_create (phy->dev,NULL , &ops);if (IS_ERR (generic_phy))return PTR_ERR (generic_phy);drivers/phy/phy-twl4030-usb.c +1
-1@@ -678,7 +678,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) otg->set_host = twl4030_set_host; otg->set_peripheral = twl4030_set_peripheral; - phy =devm_phy_create (twl->dev,NULL , &ops,NULL ); + phy =devm_phy_create (twl->dev,NULL , &ops);if (IS_ERR (phy)) {dev_dbg (&pdev->dev,"Failed to create PHY\n" );return PTR_ERR (phy);drivers/phy/phy-xgene.c +1
-1@@ -1707,7 +1707,7 @@ static int xgene_phy_probe(struct platform_device *pdev) ctx->dev = &pdev->dev;platform_set_drvdata (pdev, ctx); - ctx->phy =devm_phy_create (ctx->dev,NULL , &xgene_phy_ops,NULL ); + ctx->phy =devm_phy_create (ctx->dev,NULL , &xgene_phy_ops);if (IS_ERR (ctx->phy)) {dev_dbg (&pdev->dev,"Failed to create PHY\n" ); rc =PTR_ERR (ctx->phy);drivers/pinctrl/pinctrl-tegra-xusb.c +2
-2@@ -910,7 +910,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) goto reset; } - phy =devm_phy_create (&pdev->dev,NULL , &pcie_phy_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &pcie_phy_ops);if (IS_ERR (phy)) { err =PTR_ERR (phy); goto unregister;@@ -919,7 +919,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) padctl->phys[TEGRA_XUSB_PADCTL_PCIE ] = phy;phy_set_drvdata (phy, padctl); - phy =devm_phy_create (&pdev->dev,NULL , &sata_phy_ops,NULL ); + phy =devm_phy_create (&pdev->dev,NULL , &sata_phy_ops);if (IS_ERR (phy)) { err =PTR_ERR (phy); goto unregister;include/linux/phy/phy.h +4
-34@@ -61,7 +61,6 @@ struct phy {struct device dev;int id;const struct phy_ops *ops; -struct phy_init_data *init_data;struct mutex mutex;int init_count;int power_count;@@ -84,32 +83,6 @@ struct phy_provider { struct of_phandle_args *args); }; -/** -* struct phy_consumer - represents the phy consumer -* @dev_name: the device name of the controller that will use this PHY device -* @port: name given to the consumer port -*/ -struct phy_consumer { -const char *dev_name; -const char *port; -}; - -/** -* struct phy_init_data - contains the list of PHY consumers -* @num_consumers: number of consumers for this PHY device -* @consumers: list of PHY consumers -*/ -struct phy_init_data { -unsigned int num_consumers; -struct phy_consumer *consumers; -}; - -#define PHY_CONSUMER (_dev_name, _port) \ -{ \ - .dev_name = _dev_name, \ - .port = _port, \ -} -struct phy_lookup {struct list_head node;const char *dev_id;@@ -166,10 +139,9 @@ struct phy *of_phy_get(struct device_node *np, const char *con_id);struct phy *of_phy_simple_xlate (struct device *dev,struct of_phandle_args *args);struct phy *phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data); +const struct phy_ops *ops);struct phy *devm_phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops,struct phy_init_data *init_data); +const struct phy_ops *ops);void phy_destroy (struct phy *phy);void devm_phy_destroy (struct device *dev,struct phy *phy); struct phy_provider *__of_phy_provider_register(struct device *dev,@@ -310,16 +282,14 @@ static inline struct phy *of_phy_simple_xlate(struct device *dev,static inline struct phy *phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {return ERR_PTR (-ENOSYS ); }static inline struct phy *devm_phy_create (struct device *dev,struct device_node *node, -const struct phy_ops *ops, -struct phy_init_data *init_data) +const struct phy_ops *ops) {return ERR_PTR (-ENOSYS ); }
Quoted 11 lines · Kishon Vijay Abraham I
From: Heikki Krogerus <[email protected]>
The users of the old method are now converted to the new one.
Signed-off-by Heikki Krogerus <[email protected]>[ [email protected] : made
phy-berlin-usb.candphy-miphy28lp.cto use the updated
devm_phy_createAPI.]Signed-off-by Kishon Vijay Abraham I <[email protected]>---
Two new PHY driversphy-berlin-usb.candphy-miphy28lp.cwere added which was using the olddevm_phy_createsignature. Made it to use the newdevm_phy_createsignatiure.
I guess this will be applied to the PHY tree.
Yours,
Linus Walleij