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

Commit 8cf7651f authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I
Browse files

usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 



Now that omap-usb2 is adapted to the new generic PHY framework,
*set_suspend* ops can be removed from omap-usb2 driver.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
parent a70143bb

drivers/phy/phy-omap-usb2.c

+0 −25
Original line number Diff line number Diff line
@@ -98,28 +98,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg, 
	return 0;

}



static int omap_usb2_suspend(struct usb_phy *x, int suspend)

{

	struct omap_usb *phy = phy_to_omapusb(x);

	int ret;



	if (suspend && !phy->is_suspended) {

		omap_control_usb_phy_power(phy->control_dev, 0);

		pm_runtime_put_sync(phy->dev);

		phy->is_suspended = 1;

	} else if (!suspend && phy->is_suspended) {

		ret = pm_runtime_get_sync(phy->dev);

		if (ret < 0) {

			dev_err(phy->dev, "get_sync failed with err %d\n", ret);

			return ret;

		}

		omap_control_usb_phy_power(phy->control_dev, 1);

		phy->is_suspended = 0;

	}



	return 0;

}



static int omap_usb_power_off(struct phy *x)

{

	struct omap_usb *phy = phy_get_drvdata(x);
@@ -173,7 +151,6 @@ static int omap_usb2_probe(struct platform_device *pdev) 


	phy->phy.dev		= phy->dev;

	phy->phy.label		= "omap-usb2";

	phy->phy.set_suspend	= omap_usb2_suspend;

	phy->phy.otg		= otg;

	phy->phy.type		= USB_PHY_TYPE_USB2;
@@ -190,8 +167,6 @@ static int omap_usb2_probe(struct platform_device *pdev) 
	}



	phy->control_dev = &control_pdev->dev;



	phy->is_suspended	= 1;

	omap_control_usb_phy_power(phy->control_dev, 0);



	otg->set_host		= omap_usb_set_host;