Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1532979 > unrolled thread
| Started by | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| First post | 2016-11-30 07:00 +0100 |
| Last post | 2016-12-02 14:30 +0100 |
| Articles | 16 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:00 +0100
[PATCH 09/12] usb: phy: omap-otg: Replace the extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:00 +0100
Re: [PATCH 09/12] usb: phy: omap-otg: Replace the extcon API Felipe Balbi <balbi@kernel.org> - 2016-11-30 11:50 +0100
[PATCH 02/12] phy: sun4i-usb: Replace the deprecated extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:10 +0100
[PATCH 08/12] usb: phy: msm: Replace the extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:10 +0100
Re: [PATCH 08/12] usb: phy: msm: Replace the extcon API Felipe Balbi <balbi@kernel.org> - 2016-11-30 11:50 +0100
[PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:10 +0100
Re: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API Felipe Balbi <balbi@kernel.org> - 2016-11-30 11:50 +0100
RE: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> - 2016-12-06 02:40 +0100
[PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:10 +0100
Re: [PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API Felipe Balbi <balbi@kernel.org> - 2016-11-30 11:50 +0100
[PATCH 06/12] usb: dwc3: omap: Replace the extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-30 07:10 +0100
Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API Felipe Balbi <balbi@kernel.org> - 2016-11-30 11:40 +0100
Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API Chanwoo Choi <cw00.choi@samsung.com> - 2016-12-02 09:00 +0100
Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API Felipe Balbi <balbi@kernel.org> - 2016-12-02 10:10 +0100
Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API Chanwoo Choi <cwchoi00@gmail.com> - 2016-12-02 14:30 +0100
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:00 +0100 |
| Subject | [PATCH 00/12] extcon: Replace the deprecated extcon API |
| Message-ID | <sJ65X-214-7@gated-at.bofh.it> |
This patches just replace the deprecated extcon API without any change of extcon operation and use the resource-managed function for extcon_register_notifier(). The new extcon API instead of deprecated API. - extcon_set_cable_state_() -> extcon_set_state_sync(); - extcon_get_cable_state_() -> extcon_get_state(); The each patch has not any dependency among patches. So, each maintainer could pick up each patch without any problem. Chanwoo Choi (12): phy: rcar-gen3-usb2: Replace the deprecated extcon API phy: sun4i-usb: Replace the deprecated extcon API power_supply: axp288_charger: Replace the extcon API power_supply: qcom_smbb: Replace the deprecated extcon API usb: chipdata: Replace the extcon API usb: dwc3: omap: Replace the extcon API usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier usb: phy: msm: Replace the extcon API usb: phy: omap-otg: Replace the extcon API usb: phy: qcom-8x16-usb: Replace the extcon API usb: phy: tahvo: Replace the deprecated extcon API usb: renesas_usbhs: Replace the deprecated extcon API drivers/phy/phy-rcar-gen3-usb2.c | 8 +++--- drivers/phy/phy-sun4i-usb.c | 4 +-- drivers/power/supply/axp288_charger.c | 51 +++++++++-------------------------- drivers/power/supply/qcom_smbb.c | 2 +- drivers/usb/chipidea/core.c | 30 +++++---------------- drivers/usb/dwc3/dwc3-omap.c | 20 +++++--------- drivers/usb/musb/sunxi.c | 12 +++------ drivers/usb/phy/phy-msm-usb.c | 33 ++++++++--------------- drivers/usb/phy/phy-omap-otg.c | 24 +++++------------ drivers/usb/phy/phy-qcom-8x16-usb.c | 13 +++------ drivers/usb/phy/phy-tahvo.c | 10 +++---- drivers/usb/renesas_usbhs/common.c | 2 +- 12 files changed, 63 insertions(+), 146 deletions(-) -- 1.9.1
[toc] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:00 +0100 |
| Subject | [PATCH 09/12] usb: phy: omap-otg: Replace the extcon API |
| Message-ID | <sJ65Y-214-23@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch uses the resource-managed extcon API for extcon_register_notifier()
and replaces the deprecated extcon API as following:
- extcon_get_cable_state_() -> extcon_get_state()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/phy/phy-omap-otg.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c
index 6523af4f8f93..800d1d90753d 100644
--- a/drivers/usb/phy/phy-omap-otg.c
+++ b/drivers/usb/phy/phy-omap-otg.c
@@ -118,19 +118,19 @@ static int omap_otg_probe(struct platform_device *pdev)
otg_dev->id_nb.notifier_call = omap_otg_id_notifier;
otg_dev->vbus_nb.notifier_call = omap_otg_vbus_notifier;
- ret = extcon_register_notifier(extcon, EXTCON_USB_HOST, &otg_dev->id_nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, extcon,
+ EXTCON_USB_HOST, &otg_dev->id_nb);
if (ret)
return ret;
- ret = extcon_register_notifier(extcon, EXTCON_USB, &otg_dev->vbus_nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, extcon,
+ EXTCON_USB, &otg_dev->vbus_nb);
if (ret) {
- extcon_unregister_notifier(extcon, EXTCON_USB_HOST,
- &otg_dev->id_nb);
return ret;
}
- otg_dev->id = extcon_get_cable_state_(extcon, EXTCON_USB_HOST);
- otg_dev->vbus = extcon_get_cable_state_(extcon, EXTCON_USB);
+ otg_dev->id = extcon_get_state(extcon, EXTCON_USB_HOST);
+ otg_dev->vbus = extcon_get_state(extcon, EXTCON_USB);
omap_otg_set_mode(otg_dev);
rev = readl(otg_dev->base);
@@ -145,20 +145,8 @@ static int omap_otg_probe(struct platform_device *pdev)
return 0;
}
-static int omap_otg_remove(struct platform_device *pdev)
-{
- struct otg_device *otg_dev = platform_get_drvdata(pdev);
- struct extcon_dev *edev = otg_dev->extcon;
-
- extcon_unregister_notifier(edev, EXTCON_USB_HOST, &otg_dev->id_nb);
- extcon_unregister_notifier(edev, EXTCON_USB, &otg_dev->vbus_nb);
-
- return 0;
-}
-
static struct platform_driver omap_otg_driver = {
.probe = omap_otg_probe,
- .remove = omap_otg_remove,
.driver = {
.name = "omap_otg",
},
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-11-30 11:50 +0100 |
| Subject | Re: [PATCH 09/12] usb: phy: omap-otg: Replace the extcon API |
| Message-ID | <sJaCB-4Za-9@gated-at.bofh.it> |
| In reply to | #1532980 |
[Multipart message — attachments visible in raw view] — view raw
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > This patch uses the resource-managed extcon API for extcon_register_notifier() > and replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:10 +0100 |
| Subject | [PATCH 02/12] phy: sun4i-usb: Replace the deprecated extcon API |
| Message-ID | <sJ6fD-2kZ-5@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch replaces the deprecated extcon API as following:
- extcon_set_cable_state_() -> extcon_set_state_sync()
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/phy/phy-sun4i-usb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index eeda5134c777..95cdb08c339f 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -528,7 +528,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
mutex_unlock(&phy0->mutex);
if (id_notify) {
- extcon_set_cable_state_(data->extcon, EXTCON_USB_HOST,
+ extcon_set_state_sync(data->extcon, EXTCON_USB_HOST,
!id_det);
/* When leaving host mode force end the session here */
if (force_session_end && id_det == 1) {
@@ -541,7 +541,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
}
if (vbus_notify)
- extcon_set_cable_state_(data->extcon, EXTCON_USB, vbus_det);
+ extcon_set_state_sync(data->extcon, EXTCON_USB, vbus_det);
if (sun4i_usb_phy0_poll(data))
queue_delayed_work(system_wq, &data->detect, POLL_TIME);
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:10 +0100 |
| Subject | [PATCH 08/12] usb: phy: msm: Replace the extcon API |
| Message-ID | <sJ6fD-2kZ-3@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch uses the resource-managed extcon API for extcon_register_notifier()
and replaces the deprecated extcon API as following:
- extcon_get_cable_state_() -> extcon_get_state()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/phy/phy-msm-usb.c | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 8a34759727bb..a15a89d4235d 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1742,14 +1742,14 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
if (!IS_ERR(ext_vbus)) {
motg->vbus.extcon = ext_vbus;
motg->vbus.nb.notifier_call = msm_otg_vbus_notifier;
- ret = extcon_register_notifier(ext_vbus, EXTCON_USB,
- &motg->vbus.nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, ext_vbus,
+ EXTCON_USB, &motg->vbus.nb);
if (ret < 0) {
dev_err(&pdev->dev, "register VBUS notifier failed\n");
return ret;
}
- ret = extcon_get_cable_state_(ext_vbus, EXTCON_USB);
+ ret = extcon_get_state(ext_vbus, EXTCON_USB);
if (ret)
set_bit(B_SESS_VLD, &motg->inputs);
else
@@ -1759,16 +1759,14 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
if (!IS_ERR(ext_id)) {
motg->id.extcon = ext_id;
motg->id.nb.notifier_call = msm_otg_id_notifier;
- ret = extcon_register_notifier(ext_id, EXTCON_USB_HOST,
- &motg->id.nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, ext_id,
+ EXTCON_USB_HOST, &motg->id.nb);
if (ret < 0) {
dev_err(&pdev->dev, "register ID notifier failed\n");
- extcon_unregister_notifier(motg->vbus.extcon,
- EXTCON_USB, &motg->vbus.nb);
return ret;
}
- ret = extcon_get_cable_state_(ext_id, EXTCON_USB_HOST);
+ ret = extcon_get_state(ext_id, EXTCON_USB_HOST);
if (ret)
clear_bit(ID, &motg->inputs);
else
@@ -1883,10 +1881,9 @@ static int msm_otg_probe(struct platform_device *pdev)
*/
if (motg->phy_number) {
phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
- if (!phy_select) {
- ret = -ENOMEM;
- goto unregister_extcon;
- }
+ if (!phy_select)
+ return -ENOMEM;
+
/* Enable second PHY with the OTG port */
writel(0x1, phy_select);
}
@@ -1897,7 +1894,7 @@ static int msm_otg_probe(struct platform_device *pdev)
if (motg->irq < 0) {
dev_err(&pdev->dev, "platform_get_irq failed\n");
ret = motg->irq;
- goto unregister_extcon;
+ return motg->irq;
}
regs[0].supply = "vddcx";
@@ -1906,7 +1903,7 @@ static int msm_otg_probe(struct platform_device *pdev)
ret = devm_regulator_bulk_get(motg->phy.dev, ARRAY_SIZE(regs), regs);
if (ret)
- goto unregister_extcon;
+ return ret;
motg->vddcx = regs[0].consumer;
motg->v3p3 = regs[1].consumer;
@@ -2003,11 +2000,6 @@ static int msm_otg_probe(struct platform_device *pdev)
clk_disable_unprepare(motg->clk);
if (!IS_ERR(motg->core_clk))
clk_disable_unprepare(motg->core_clk);
-unregister_extcon:
- extcon_unregister_notifier(motg->id.extcon,
- EXTCON_USB_HOST, &motg->id.nb);
- extcon_unregister_notifier(motg->vbus.extcon,
- EXTCON_USB, &motg->vbus.nb);
return ret;
}
@@ -2029,9 +2021,6 @@ static int msm_otg_remove(struct platform_device *pdev)
*/
gpiod_set_value_cansleep(motg->switch_gpio, 0);
- extcon_unregister_notifier(motg->id.extcon, EXTCON_USB_HOST, &motg->id.nb);
- extcon_unregister_notifier(motg->vbus.extcon, EXTCON_USB, &motg->vbus.nb);
-
msm_otg_debugfs_cleanup();
cancel_delayed_work_sync(&motg->chg_work);
cancel_work_sync(&motg->sm_work);
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-11-30 11:50 +0100 |
| Subject | Re: [PATCH 08/12] usb: phy: msm: Replace the extcon API |
| Message-ID | <sJaCC-4Za-21@gated-at.bofh.it> |
| In reply to | #1532984 |
[Multipart message — attachments visible in raw view] — view raw
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > This patch uses the resource-managed extcon API for extcon_register_notifier() > and replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:10 +0100 |
| Subject | [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API |
| Message-ID | <sJ6fE-2kZ-19@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch replaces the deprecated extcon API as following:
- extcon_get_cable_state_() -> extcon_get_state()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/renesas_usbhs/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 012a37aa3e0d..623c51300393 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -389,7 +389,7 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
if (enable && !mod) {
if (priv->edev) {
- cable = extcon_get_cable_state_(priv->edev, EXTCON_USB_HOST);
+ cable = extcon_get_state(priv->edev, EXTCON_USB_HOST);
if ((cable > 0 && id != USBHS_HOST) ||
(!cable && id != USBHS_GADGET)) {
dev_info(&pdev->dev,
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-11-30 11:50 +0100 |
| Subject | Re: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API |
| Message-ID | <sJaCC-4Za-27@gated-at.bofh.it> |
| In reply to | #1532986 |
[Multipart message — attachments visible in raw view] — view raw
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > This patch replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
|---|---|
| Date | 2016-12-06 02:40 +0100 |
| Subject | RE: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API |
| Message-ID | <sLcTE-3Ly-5@gated-at.bofh.it> |
| In reply to | #1532986 |
Hi, > From: Chanwoo Choi > Sent: Wednesday, November 30, 2016 2:58 PM > > This patch replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Thank you for the patch! Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:10 +0100 |
| Subject | [PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API |
| Message-ID | <sJ6fE-2kZ-9@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch uses the resource-managed extcon API for extcon_register_notifier() and replaces the deprecated extcon API as following: - extcon_get_cable_state_() -> extcon_get_state() Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> --- drivers/usb/phy/phy-qcom-8x16-usb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c index d8593adb3621..fdf686398772 100644 --- a/drivers/usb/phy/phy-qcom-8x16-usb.c +++ b/drivers/usb/phy/phy-qcom-8x16-usb.c @@ -187,7 +187,7 @@ static int phy_8x16_init(struct usb_phy *phy) val = ULPI_PWR_OTG_COMP_DISABLE; usb_phy_io_write(phy, val, ULPI_SET(ULPI_PWR_CLK_MNG_REG)); - state = extcon_get_cable_state_(qphy->vbus_edev, EXTCON_USB); + state = extcon_get_state(qphy->vbus_edev, EXTCON_USB); if (state) phy_8x16_vbus_on(qphy); else @@ -316,23 +316,20 @@ static int phy_8x16_probe(struct platform_device *pdev) goto off_clks; qphy->vbus_notify.notifier_call = phy_8x16_vbus_notify; - ret = extcon_register_notifier(qphy->vbus_edev, EXTCON_USB, - &qphy->vbus_notify); + ret = devm_extcon_register_notifier(&pdev->dev, qphy->vbus_edev, + EXTCON_USB, &qphy->vbus_notify); if (ret < 0) goto off_power; ret = usb_add_phy_dev(&qphy->phy); if (ret) - goto off_extcon; + goto off_power; qphy->reboot_notify.notifier_call = phy_8x16_reboot_notify; register_reboot_notifier(&qphy->reboot_notify); return 0; -off_extcon: - extcon_unregister_notifier(qphy->vbus_edev, EXTCON_USB, - &qphy->vbus_notify); off_power: regulator_bulk_disable(ARRAY_SIZE(qphy->regulator), qphy->regulator); off_clks: @@ -347,8 +344,6 @@ static int phy_8x16_remove(struct platform_device *pdev) struct phy_8x16 *qphy = platform_get_drvdata(pdev); unregister_reboot_notifier(&qphy->reboot_notify); - extcon_unregister_notifier(qphy->vbus_edev, EXTCON_USB, - &qphy->vbus_notify); /* * Ensure that D+/D- lines are routed to uB connector, so -- 1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-11-30 11:50 +0100 |
| Subject | Re: [PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API |
| Message-ID | <sJaCC-4Za-23@gated-at.bofh.it> |
| In reply to | #1532987 |
[Multipart message — attachments visible in raw view] — view raw
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > This patch uses the resource-managed extcon API for extcon_register_notifier() > and replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-11-30 07:10 +0100 |
| Subject | [PATCH 06/12] usb: dwc3: omap: Replace the extcon API |
| Message-ID | <sJ6fE-2kZ-15@gated-at.bofh.it> |
| In reply to | #1532979 |
This patch uses the resource-managed extcon API for extcon_register_notifier()
and replaces the deprecated extcon API as following:
- extcon_get_cable_state_() -> extcon_get_state()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/dwc3/dwc3-omap.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 29e80cc9b634..2d2e9aa1db08 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -425,20 +425,20 @@ static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
}
omap->vbus_nb.notifier_call = dwc3_omap_vbus_notifier;
- ret = extcon_register_notifier(edev, EXTCON_USB,
- &omap->vbus_nb);
+ ret = devm_extcon_register_notifier(omap->dev, edev,
+ EXTCON_USB, &omap->vbus_nb);
if (ret < 0)
dev_vdbg(omap->dev, "failed to register notifier for USB\n");
omap->id_nb.notifier_call = dwc3_omap_id_notifier;
- ret = extcon_register_notifier(edev, EXTCON_USB_HOST,
- &omap->id_nb);
+ ret = devm_extcon_register_notifier(omap->dev, edev,
+ EXTCON_USB_HOST, &omap->id_nb);
if (ret < 0)
dev_vdbg(omap->dev, "failed to register notifier for USB-HOST\n");
- if (extcon_get_cable_state_(edev, EXTCON_USB) == true)
+ if (extcon_get_state(edev, EXTCON_USB) == true)
dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
- if (extcon_get_cable_state_(edev, EXTCON_USB_HOST) == true)
+ if (extcon_get_state(edev, EXTCON_USB_HOST) == true)
dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
omap->edev = edev;
@@ -527,17 +527,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
ret = of_platform_populate(node, NULL, NULL, dev);
if (ret) {
dev_err(&pdev->dev, "failed to create dwc3 core\n");
- goto err2;
+ goto err1;
}
dwc3_omap_enable_irqs(omap);
return 0;
-err2:
- extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);
- extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);
-
err1:
pm_runtime_put_sync(dev);
pm_runtime_disable(dev);
@@ -549,8 +545,6 @@ static int dwc3_omap_remove(struct platform_device *pdev)
{
struct dwc3_omap *omap = platform_get_drvdata(pdev);
- extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);
- extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);
dwc3_omap_disable_irqs(omap);
of_platform_depopulate(omap->dev);
pm_runtime_put_sync(&pdev->dev);
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-11-30 11:40 +0100 |
| Subject | Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API |
| Message-ID | <sJasW-4VL-11@gated-at.bofh.it> |
| In reply to | #1532988 |
[Multipart message — attachments visible in raw view] — view raw
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > This patch uses the resource-managed extcon API for extcon_register_notifier() > and replaces the deprecated extcon API as following: > - extcon_get_cable_state_() -> extcon_get_state() > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cw00.choi@samsung.com> |
|---|---|
| Date | 2016-12-02 09:00 +0100 |
| Subject | Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API |
| Message-ID | <sJQVh-HL-13@gated-at.bofh.it> |
| In reply to | #1533201 |
Hi Felipe, On 2016년 11월 30일 19:36, Felipe Balbi wrote: > > Hi, > > Chanwoo Choi <cw00.choi@samsung.com> writes: >> This patch uses the resource-managed extcon API for extcon_register_notifier() >> and replaces the deprecated extcon API as following: >> - extcon_get_cable_state_() -> extcon_get_state() >> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > > Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> > Thanks for your review. Each patch has no any dependency among patches. So, If possible, could you pick the patch6/8/9/10/11/12 on your tree? -- Best Regards, Chanwoo Choi
[toc] | [prev] | [next] | [standalone]
| From | Felipe Balbi <balbi@kernel.org> |
|---|---|
| Date | 2016-12-02 10:10 +0100 |
| Subject | Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API |
| Message-ID | <sJS0W-1Sd-29@gated-at.bofh.it> |
| In reply to | #1534721 |
Hi, Chanwoo Choi <cw00.choi@samsung.com> writes: > Hi Felipe, > > On 2016년 11월 30일 19:36, Felipe Balbi wrote: >> >> Hi, >> >> Chanwoo Choi <cw00.choi@samsung.com> writes: >>> This patch uses the resource-managed extcon API for extcon_register_notifier() >>> and replaces the deprecated extcon API as following: >>> - extcon_get_cable_state_() -> extcon_get_state() >>> >>> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >> >> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> >> > > Thanks for your review. > > Each patch has no any dependency among patches. > So, If possible, could you pick the patch6/8/9/10/11/12 on your tree? my tree is closed for v4.10, I can pick it up for v4.11 -- balbi
[toc] | [prev] | [next] | [standalone]
| From | Chanwoo Choi <cwchoi00@gmail.com> |
|---|---|
| Date | 2016-12-02 14:30 +0100 |
| Subject | Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API |
| Message-ID | <sJW4x-4mD-11@gated-at.bofh.it> |
| In reply to | #1534755 |
Hi Felipe, 2016-12-02 18:03 GMT+09:00 Felipe Balbi <balbi@kernel.org>: > > Hi, > > Chanwoo Choi <cw00.choi@samsung.com> writes: >> Hi Felipe, >> >> On 2016년 11월 30일 19:36, Felipe Balbi wrote: >>> >>> Hi, >>> >>> Chanwoo Choi <cw00.choi@samsung.com> writes: >>>> This patch uses the resource-managed extcon API for extcon_register_notifier() >>>> and replaces the deprecated extcon API as following: >>>> - extcon_get_cable_state_() -> extcon_get_state() >>>> >>>> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >>> >>> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> >>> >> >> Thanks for your review. >> >> Each patch has no any dependency among patches. >> So, If possible, could you pick the patch6/8/9/10/11/12 on your tree? > > my tree is closed for v4.10, I can pick it up for v4.11 Thanks for your pickup to 4.11. -- Best Regards, Chanwoo Choi
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web