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

Commit 8a454077 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: phy: initialize the notifier when add a new phy"

parents 1ad86d35 4121ad35

drivers/usb/phy/phy-ab8500-usb.c

+0 −2
Original line number Diff line number Diff line
@@ -774,8 +774,6 @@ static int ab8500_usb_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ab);



	ATOMIC_INIT_NOTIFIER_HEAD(&ab->phy.notifier);



	/* all: Disable phy when called from set_host and set_peripheral */

	INIT_WORK(&ab->phy_dis_work, ab8500_usb_phy_disable_work);

drivers/usb/phy/phy-gpio-vbus-usb.c

+0 −2
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ static int __init gpio_vbus_probe(struct platform_device *pdev) 
		goto err_irq;

	}



	ATOMIC_INIT_NOTIFIER_HEAD(&gpio_vbus->phy.notifier);



	INIT_DELAYED_WORK(&gpio_vbus->work, gpio_vbus_work);



	gpio_vbus->vbus_draw = regulator_get(&pdev->dev, "vbus_draw");

drivers/usb/phy/phy-mxs-usb.c

+0 −2
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ static int mxs_phy_probe(struct platform_device *pdev) 
	mxs_phy->phy.notify_disconnect	= mxs_phy_on_disconnect;

	mxs_phy->phy.type		= USB_PHY_TYPE_USB2;



	ATOMIC_INIT_NOTIFIER_HEAD(&mxs_phy->phy.notifier);



	mxs_phy->clk = clk;



	platform_set_drvdata(pdev, &mxs_phy->phy);

drivers/usb/phy/phy.c

+4 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ int usb_add_phy(struct usb_phy *x, enum usb_phy_type type) 
		return -EINVAL;

	}



	ATOMIC_INIT_NOTIFIER_HEAD(&x->notifier);



	spin_lock_irqsave(&phy_lock, flags);



	list_for_each_entry(phy, &phy_list, head) {
@@ -367,6 +369,8 @@ int usb_add_phy_dev(struct usb_phy *x) 
		return -EINVAL;

	}



	ATOMIC_INIT_NOTIFIER_HEAD(&x->notifier);



	spin_lock_irqsave(&phy_lock, flags);

	list_for_each_entry(phy_bind, &phy_bind_list, list)

		if (!(strcmp(phy_bind->phy_dev_name, dev_name(x->dev))))