Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a4a72a authored by Axel Lin's avatar Axel Lin Committed by Kishon Vijay Abraham I
Browse files

phy: omap-usb2: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr 



if !CONFIG_OF, the probe fails.
This is a dt-only driver, so the ifdef CONFIG_OF guard and of_match_ptr are
not needed.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 1f9ba767

drivers/phy/phy-omap-usb2.c

+2 −4
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static struct phy_ops ops = { 
	.owner		= THIS_MODULE,

};



#ifdef CONFIG_OF

static const struct usb_phy_data omap_usb2_data = {

	.label = "omap_usb2",

	.flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS,
@@ -185,7 +184,6 @@ static const struct of_device_id omap_usb2_id_table[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, omap_usb2_id_table);

#endif



static int omap_usb2_probe(struct platform_device *pdev)

{
@@ -200,7 +198,7 @@ static int omap_usb2_probe(struct platform_device *pdev) 
	const struct of_device_id *of_id;

	struct usb_phy_data *phy_data;



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

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



	if (!of_id)

		return -EINVAL;
@@ -377,7 +375,7 @@ static struct platform_driver omap_usb2_driver = { 
	.driver		= {

		.name	= "omap-usb2",

		.pm	= DEV_PM_OPS,

		.of_match_table = of_match_ptr(omap_usb2_id_table),

		.of_match_table = omap_usb2_id_table,

	},

};