Commit 21bf6fc4 authored by Rob Herring's avatar Rob Herring Committed by Vinod Koul
Browse files

phy: Use device_get_match_data() 



Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20231009172923.2457844-15-robh@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 7e909370

drivers/phy/broadcom/phy-bcm-ns-usb3.c

+3 −6
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
#include <linux/iopoll.h>

#include <linux/mdio.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/phy/phy.h>

#include <linux/property.h>

#include <linux/slab.h>



#define BCM_NS_USB3_PHY_BASE_ADDR_REG	0x1f
@@ -189,7 +190,6 @@ static int bcm_ns_usb3_mdio_phy_write(struct bcm_ns_usb3 *usb3, u16 reg, 
static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev)

{

	struct device *dev = &mdiodev->dev;

	const struct of_device_id *of_id;

	struct phy_provider *phy_provider;

	struct device_node *syscon_np;

	struct bcm_ns_usb3 *usb3;
@@ -203,10 +203,7 @@ static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev) 
	usb3->dev = dev;

	usb3->mdiodev = mdiodev;



	of_id = of_match_device(bcm_ns_usb3_id_table, dev);

	if (!of_id)

		return -EINVAL;

	usb3->family = (uintptr_t)of_id->data;

	usb3->family = (enum bcm_ns_family)device_get_match_data(dev);



	syscon_np = of_parse_phandle(dev->of_node, "usb3-dmp-syscon", 0);

	err = of_address_to_resource(syscon_np, 0, &res);

drivers/phy/marvell/phy-berlin-usb.c

+3 −4
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ 


#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/reset.h>



#define USB_PHY_PLL		0x04
@@ -162,8 +163,6 @@ MODULE_DEVICE_TABLE(of, phy_berlin_usb_of_match); 


static int phy_berlin_usb_probe(struct platform_device *pdev)

{

	const struct of_device_id *match =

		of_match_device(phy_berlin_usb_of_match, &pdev->dev);

	struct phy_berlin_usb_priv *priv;

	struct phy *phy;

	struct phy_provider *phy_provider;
@@ -180,7 +179,7 @@ static int phy_berlin_usb_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->rst_ctrl))

		return PTR_ERR(priv->rst_ctrl);



	priv->pll_divider = *((u32 *)match->data);

	priv->pll_divider = *((u32 *)device_get_match_data(&pdev->dev));



	phy = devm_phy_create(&pdev->dev, NULL, &phy_berlin_usb_ops);

	if (IS_ERR(phy)) {

drivers/phy/ralink/phy-ralink-usb.c

+3 −7
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/reset.h>
@@ -171,18 +172,13 @@ static int ralink_usb_phy_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct phy_provider *phy_provider;

	const struct of_device_id *match;

	struct ralink_usb_phy *phy;



	match = of_match_device(ralink_usb_phy_of_match, &pdev->dev);

	if (!match)

		return -ENODEV;



	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	phy->clk = (uintptr_t)match->data;

	phy->clk = (uintptr_t)device_get_match_data(&pdev->dev);

	phy->base = NULL;



	phy->sysctl = syscon_regmap_lookup_by_phandle(dev->of_node, "ralink,sysctl");

drivers/phy/rockchip/phy-rockchip-pcie.c

+4 −7
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/reset.h>
@@ -63,7 +62,7 @@ struct rockchip_pcie_data { 
};



struct rockchip_pcie_phy {

	struct rockchip_pcie_data *phy_data;

	const struct rockchip_pcie_data *phy_data;

	struct regmap *reg_base;

	struct phy_pcie_instance {

		struct phy *phy;
@@ -350,7 +349,6 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) 
	struct rockchip_pcie_phy *rk_phy;

	struct phy_provider *phy_provider;

	struct regmap *grf;

	const struct of_device_id *of_id;

	int i;

	u32 phy_num;
@@ -364,11 +362,10 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) 
	if (!rk_phy)

		return -ENOMEM;



	of_id = of_match_device(rockchip_pcie_phy_dt_ids, &pdev->dev);

	if (!of_id)

	rk_phy->phy_data = device_get_match_data(&pdev->dev);

	if (!rk_phy->phy_data)

		return -EINVAL;



	rk_phy->phy_data = (struct rockchip_pcie_data *)of_id->data;

	rk_phy->reg_base = grf;



	mutex_init(&rk_phy->pcie_mutex);

drivers/phy/rockchip/phy-rockchip-usb.c

+3 −7
Original line number Diff line number Diff line
@@ -13,10 +13,9 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>

#include <linux/regmap.h>
@@ -458,7 +457,6 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct rockchip_usb_phy_base *phy_base;

	struct phy_provider *phy_provider;

	const struct of_device_id *match;

	struct device_node *child;

	int err;
@@ -466,14 +464,12 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) 
	if (!phy_base)

		return -ENOMEM;



	match = of_match_device(dev->driver->of_match_table, dev);

	if (!match || !match->data) {

	phy_base->pdata = device_get_match_data(dev);

	if (!phy_base->pdata) {

		dev_err(dev, "missing phy data\n");

		return -EINVAL;

	}



	phy_base->pdata = match->data;



	phy_base->dev = dev;

	phy_base->reg_base = ERR_PTR(-ENODEV);

	if (dev->parent && dev->parent->of_node)