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

Commit 1b59fc7e authored by Kamil Debski's avatar Kamil Debski Committed by Greg Kroah-Hartman
Browse files

usb: dwc2/gadget: move phy bus legth initialization 



This patch moves the part of code that initializes the PHY bus width.
This results in simpler code and removes the need to check whether
the Generic PHY Framework is used.

Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 346e2e4a

drivers/usb/dwc2/gadget.c

+11 −11
Original line number Diff line number Diff line
@@ -3423,6 +3423,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
	if (!hsotg)

		return -ENOMEM;



	/* Set default UTMI width */

	hsotg->phyif = GUSBCFG_PHYIF16;



	/*

	 * Attempt to find a generic PHY, then look for an old style

	 * USB PHY, finally fall back to pdata
@@ -3441,8 +3444,15 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
			hsotg->plat = plat;

		} else

			hsotg->uphy = uphy;

	} else

	} else {

		hsotg->phy = phy;

		/*

		 * If using the generic PHY framework, check if the PHY bus

		 * width is 8-bit and set the phyif appropriately.

		 */

		if (phy_get_bus_width(phy) == 8)

			hsotg->phyif = GUSBCFG_PHYIF8;

	}



	hsotg->dev = dev;
@@ -3502,16 +3512,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 
		goto err_supplies;

	}



	/* Set default UTMI width */

	hsotg->phyif = GUSBCFG_PHYIF16;



	/*

	 * If using the generic PHY framework, check if the PHY bus

	 * width is 8-bit and set the phyif appropriately.

	 */

	if (hsotg->phy && (phy_get_bus_width(phy) == 8))

		hsotg->phyif = GUSBCFG_PHYIF8;



	/* usb phy enable */

	s3c_hsotg_phy_enable(hsotg);