* [PATCH 01/12] phy: rcar-gen3-usb2: Replace the deprecated extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-12-06 0:25 ` Chanwoo Choi
2016-12-06 1:35 ` Yoshihiro Shimoda
2016-11-30 5:57 ` [PATCH 02/12] phy: sun4i-usb: " Chanwoo Choi
` (10 subsequent siblings)
11 siblings, 2 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
This patch replaces the deprecated extcon API as following:
- extcon_set_cable_state_() -> extcon_set_state_sync()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/phy/phy-rcar-gen3-usb2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index bd2430d7339c..7f8081f157f4 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -93,11 +93,11 @@ static void rcar_gen3_phy_usb2_work(struct work_struct *work)
work);
if (ch->extcon_host) {
- extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, true);
- extcon_set_cable_state_(ch->extcon, EXTCON_USB, false);
+ extcon_set_state_sync(ch->extcon, EXTCON_USB_HOST, true);
+ extcon_set_state_sync(ch->extcon, EXTCON_USB, false);
} else {
- extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, false);
- extcon_set_cable_state_(ch->extcon, EXTCON_USB, true);
+ extcon_set_state_sync(ch->extcon, EXTCON_USB_HOST, false);
+ extcon_set_state_sync(ch->extcon, EXTCON_USB, true);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 01/12] phy: rcar-gen3-usb2: Replace the deprecated extcon API
2016-11-30 5:57 ` [PATCH 01/12] phy: rcar-gen3-usb2: " Chanwoo Choi
@ 2016-12-06 0:25 ` Chanwoo Choi
2016-12-06 1:35 ` Yoshihiro Shimoda
1 sibling, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-06 0:25 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
Hi Kishon,
Could you review and pick the patch1/2 for phy driver?
Best Regards,
Chanwoo Choi
On 2016년 11월 30일 14:57, Chanwoo Choi wrote:
> This patch replaces the deprecated extcon API as following:
> - extcon_set_cable_state_() -> extcon_set_state_sync()
>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
> drivers/phy/phy-rcar-gen3-usb2.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
> index bd2430d7339c..7f8081f157f4 100644
> --- a/drivers/phy/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/phy-rcar-gen3-usb2.c
> @@ -93,11 +93,11 @@ static void rcar_gen3_phy_usb2_work(struct work_struct *work)
> work);
>
> if (ch->extcon_host) {
> - extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, true);
> - extcon_set_cable_state_(ch->extcon, EXTCON_USB, false);
> + extcon_set_state_sync(ch->extcon, EXTCON_USB_HOST, true);
> + extcon_set_state_sync(ch->extcon, EXTCON_USB, false);
> } else {
> - extcon_set_cable_state_(ch->extcon, EXTCON_USB_HOST, false);
> - extcon_set_cable_state_(ch->extcon, EXTCON_USB, true);
> + extcon_set_state_sync(ch->extcon, EXTCON_USB_HOST, false);
> + extcon_set_state_sync(ch->extcon, EXTCON_USB, true);
> }
> }
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread* RE: [PATCH 01/12] phy: rcar-gen3-usb2: Replace the deprecated extcon API
2016-11-30 5:57 ` [PATCH 01/12] phy: rcar-gen3-usb2: " Chanwoo Choi
2016-12-06 0:25 ` Chanwoo Choi
@ 2016-12-06 1:35 ` Yoshihiro Shimoda
1 sibling, 0 replies; 34+ messages in thread
From: Yoshihiro Shimoda @ 2016-12-06 1:35 UTC (permalink / raw)
To: Chanwoo Choi, balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, maxime.ripard, b-liu, linux-kernel,
linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
Hi,
> From: Chanwoo Choi
> Sent: Wednesday, November 30, 2016 2:57 PM
>
> This patch replaces the deprecated extcon API as following:
> - extcon_set_cable_state_() -> extcon_set_state_sync()
>
> 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 02/12] phy: sun4i-usb: Replace the deprecated extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
2016-11-30 5:57 ` [PATCH 01/12] phy: rcar-gen3-usb2: " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 03/12] power_supply: axp288_charger: Replace the " Chanwoo Choi
` (9 subsequent siblings)
11 siblings, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
2016-11-30 5:57 ` [PATCH 01/12] phy: rcar-gen3-usb2: " Chanwoo Choi
2016-11-30 5:57 ` [PATCH 02/12] phy: sun4i-usb: " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-12-06 0:26 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 04/12] power_supply: qcom_smbb: Replace the deprecated " Chanwoo Choi
` (8 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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/power/supply/axp288_charger.c | 51 +++++++++--------------------------
1 file changed, 13 insertions(+), 38 deletions(-)
diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c
index 75b8e0c7402b..1115052e9a69 100644
--- a/drivers/power/supply/axp288_charger.c
+++ b/drivers/power/supply/axp288_charger.c
@@ -581,15 +581,15 @@ static void axp288_charger_extcon_evt_worker(struct work_struct *work)
bool old_connected = info->cable.connected;
/* Determine cable/charger type */
- if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_SDP) > 0) {
+ if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
dev_dbg(&info->pdev->dev, "USB SDP charger is connected");
info->cable.connected = true;
info->cable.chg_type = POWER_SUPPLY_TYPE_USB;
- } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_CDP) > 0) {
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
dev_dbg(&info->pdev->dev, "USB CDP charger is connected");
info->cable.connected = true;
info->cable.chg_type = POWER_SUPPLY_TYPE_USB_CDP;
- } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_DCP) > 0) {
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
dev_dbg(&info->pdev->dev, "USB DCP charger is connected");
info->cable.connected = true;
info->cable.chg_type = POWER_SUPPLY_TYPE_USB_DCP;
@@ -686,7 +686,7 @@ static int axp288_charger_handle_otg_evt(struct notifier_block *nb,
struct axp288_chrg_info *info =
container_of(nb, struct axp288_chrg_info, otg.id_nb);
struct extcon_dev *edev = info->otg.cable;
- int usb_host = extcon_get_cable_state_(edev, EXTCON_USB_HOST);
+ int usb_host = extcon_get_state(edev, EXTCON_USB_HOST);
dev_dbg(&info->pdev->dev, "external connector USB-Host is %s\n",
usb_host ? "attached" : "detached");
@@ -841,33 +841,27 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for extcon notification */
INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
- ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
- &info->cable.nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
+ EXTCON_CHG_USB_SDP, &info->cable.nb);
if (ret) {
dev_err(&info->pdev->dev,
"failed to register extcon notifier for SDP %d\n", ret);
return ret;
}
- ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
- &info->cable.nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
+ EXTCON_CHG_USB_CDP, &info->cable.nb);
if (ret) {
dev_err(&info->pdev->dev,
"failed to register extcon notifier for CDP %d\n", ret);
- extcon_unregister_notifier(info->cable.edev,
- EXTCON_CHG_USB_SDP, &info->cable.nb);
return ret;
}
- ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
- &info->cable.nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
+ EXTCON_CHG_USB_DCP, &info->cable.nb);
if (ret) {
dev_err(&info->pdev->dev,
"failed to register extcon notifier for DCP %d\n", ret);
- extcon_unregister_notifier(info->cable.edev,
- EXTCON_CHG_USB_SDP, &info->cable.nb);
- extcon_unregister_notifier(info->cable.edev,
- EXTCON_CHG_USB_CDP, &info->cable.nb);
return ret;
}
@@ -887,13 +881,13 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for OTG notification */
INIT_WORK(&info->otg.work, axp288_charger_otg_evt_worker);
info->otg.id_nb.notifier_call = axp288_charger_handle_otg_evt;
- ret = extcon_register_notifier(info->otg.cable, EXTCON_USB_HOST,
- &info->otg.id_nb);
+ ret = devm_extcon_register_notifier(&pdev->dev, info->otg.cable,
+ EXTCON_USB_HOST, &info->otg.id_nb);
if (ret)
dev_warn(&pdev->dev, "failed to register otg notifier\n");
if (info->otg.cable)
- info->otg.id_short = extcon_get_cable_state_(
+ info->otg.id_short = extcon_get_state(
info->otg.cable, EXTCON_USB_HOST);
/* Register charger interrupts */
@@ -921,17 +915,8 @@ static int axp288_charger_probe(struct platform_device *pdev)
return 0;
intr_reg_failed:
- if (info->otg.cable)
- extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST,
- &info->otg.id_nb);
power_supply_unregister(info->psy_usb);
psy_reg_failed:
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
- &info->cable.nb);
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
- &info->cable.nb);
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
- &info->cable.nb);
return ret;
}
@@ -939,16 +924,6 @@ static int axp288_charger_remove(struct platform_device *pdev)
{
struct axp288_chrg_info *info = dev_get_drvdata(&pdev->dev);
- if (info->otg.cable)
- extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST,
- &info->otg.id_nb);
-
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
- &info->cable.nb);
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
- &info->cable.nb);
- extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
- &info->cable.nb);
power_supply_unregister(info->psy_usb);
return 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API
2016-11-30 5:57 ` [PATCH 03/12] power_supply: axp288_charger: Replace the " Chanwoo Choi
@ 2016-12-06 0:26 ` Chanwoo Choi
2016-12-07 3:05 ` Sebastian Reichel
0 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-06 0:26 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
Hi Sebastian,
Could you please review and pick the patch3/4 for power-supply driver?
Best Regards,
Chanwoo Choi
On 2016년 11월 30일 14:57, Chanwoo Choi wrote:
> 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/power/supply/axp288_charger.c | 51 +++++++++--------------------------
> 1 file changed, 13 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c
> index 75b8e0c7402b..1115052e9a69 100644
> --- a/drivers/power/supply/axp288_charger.c
> +++ b/drivers/power/supply/axp288_charger.c
> @@ -581,15 +581,15 @@ static void axp288_charger_extcon_evt_worker(struct work_struct *work)
> bool old_connected = info->cable.connected;
>
> /* Determine cable/charger type */
> - if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_SDP) > 0) {
> + if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
> dev_dbg(&info->pdev->dev, "USB SDP charger is connected");
> info->cable.connected = true;
> info->cable.chg_type = POWER_SUPPLY_TYPE_USB;
> - } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_CDP) > 0) {
> + } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
> dev_dbg(&info->pdev->dev, "USB CDP charger is connected");
> info->cable.connected = true;
> info->cable.chg_type = POWER_SUPPLY_TYPE_USB_CDP;
> - } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_DCP) > 0) {
> + } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
> dev_dbg(&info->pdev->dev, "USB DCP charger is connected");
> info->cable.connected = true;
> info->cable.chg_type = POWER_SUPPLY_TYPE_USB_DCP;
> @@ -686,7 +686,7 @@ static int axp288_charger_handle_otg_evt(struct notifier_block *nb,
> struct axp288_chrg_info *info =
> container_of(nb, struct axp288_chrg_info, otg.id_nb);
> struct extcon_dev *edev = info->otg.cable;
> - int usb_host = extcon_get_cable_state_(edev, EXTCON_USB_HOST);
> + int usb_host = extcon_get_state(edev, EXTCON_USB_HOST);
>
> dev_dbg(&info->pdev->dev, "external connector USB-Host is %s\n",
> usb_host ? "attached" : "detached");
> @@ -841,33 +841,27 @@ static int axp288_charger_probe(struct platform_device *pdev)
> /* Register for extcon notification */
> INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
> info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
> - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
> - &info->cable.nb);
> + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
> + EXTCON_CHG_USB_SDP, &info->cable.nb);
> if (ret) {
> dev_err(&info->pdev->dev,
> "failed to register extcon notifier for SDP %d\n", ret);
> return ret;
> }
>
> - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
> - &info->cable.nb);
> + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
> + EXTCON_CHG_USB_CDP, &info->cable.nb);
> if (ret) {
> dev_err(&info->pdev->dev,
> "failed to register extcon notifier for CDP %d\n", ret);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_SDP, &info->cable.nb);
> return ret;
> }
>
> - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
> - &info->cable.nb);
> + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev,
> + EXTCON_CHG_USB_DCP, &info->cable.nb);
> if (ret) {
> dev_err(&info->pdev->dev,
> "failed to register extcon notifier for DCP %d\n", ret);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_SDP, &info->cable.nb);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_CDP, &info->cable.nb);
> return ret;
> }
>
> @@ -887,13 +881,13 @@ static int axp288_charger_probe(struct platform_device *pdev)
> /* Register for OTG notification */
> INIT_WORK(&info->otg.work, axp288_charger_otg_evt_worker);
> info->otg.id_nb.notifier_call = axp288_charger_handle_otg_evt;
> - ret = extcon_register_notifier(info->otg.cable, EXTCON_USB_HOST,
> - &info->otg.id_nb);
> + ret = devm_extcon_register_notifier(&pdev->dev, info->otg.cable,
> + EXTCON_USB_HOST, &info->otg.id_nb);
> if (ret)
> dev_warn(&pdev->dev, "failed to register otg notifier\n");
>
> if (info->otg.cable)
> - info->otg.id_short = extcon_get_cable_state_(
> + info->otg.id_short = extcon_get_state(
> info->otg.cable, EXTCON_USB_HOST);
>
> /* Register charger interrupts */
> @@ -921,17 +915,8 @@ static int axp288_charger_probe(struct platform_device *pdev)
> return 0;
>
> intr_reg_failed:
> - if (info->otg.cable)
> - extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST,
> - &info->otg.id_nb);
> power_supply_unregister(info->psy_usb);
> psy_reg_failed:
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
> - &info->cable.nb);
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
> - &info->cable.nb);
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
> - &info->cable.nb);
> return ret;
> }
>
> @@ -939,16 +924,6 @@ static int axp288_charger_remove(struct platform_device *pdev)
> {
> struct axp288_chrg_info *info = dev_get_drvdata(&pdev->dev);
>
> - if (info->otg.cable)
> - extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST,
> - &info->otg.id_nb);
> -
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP,
> - &info->cable.nb);
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP,
> - &info->cable.nb);
> - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
> - &info->cable.nb);
> power_supply_unregister(info->psy_usb);
>
> return 0;
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API
2016-12-06 0:26 ` Chanwoo Choi
@ 2016-12-07 3:05 ` Sebastian Reichel
2016-12-07 3:45 ` Chanwoo Choi
0 siblings, 1 reply; 34+ messages in thread
From: Sebastian Reichel @ 2016-12-07 3:05 UTC (permalink / raw)
To: Chanwoo Choi
Cc: balbi, gregkh, kishon, Peter.Chen, wens, yoshihiro.shimoda.uh,
maxime.ripard, b-liu, linux-kernel, linux-arm-kernel, linux-pm,
linux-usb, linux-omap, linux-renesas-soc, chanwoo
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
Hi Chanwoo,
On Tue, Dec 06, 2016 at 09:26:14AM +0900, Chanwoo Choi wrote:
> Could you please review and pick the patch3/4 for power-supply driver?
Patches look fine. As I expect the merge window to open next week I
would rather not queue this for 4.10 and instead do it once 4.10-rc1
has been tagged.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API
2016-12-07 3:05 ` Sebastian Reichel
@ 2016-12-07 3:45 ` Chanwoo Choi
0 siblings, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-07 3:45 UTC (permalink / raw)
To: Sebastian Reichel
Cc: balbi, gregkh, kishon, Peter.Chen, wens, yoshihiro.shimoda.uh,
maxime.ripard, b-liu, linux-kernel, linux-arm-kernel, linux-pm,
linux-usb, linux-omap, linux-renesas-soc, chanwoo
Hi Sebastian,
On 2016년 12월 07일 12:05, Sebastian Reichel wrote:
> Hi Chanwoo,
>
> On Tue, Dec 06, 2016 at 09:26:14AM +0900, Chanwoo Choi wrote:
>> Could you please review and pick the patch3/4 for power-supply driver?
>
> Patches look fine. As I expect the merge window to open next week I
> would rather not queue this for 4.10 and instead do it once 4.10-rc1
> has been tagged.
>
> -- Sebastian
>
Thanks for your pick up.
--
Best Regards,
Chanwoo Choi
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 04/12] power_supply: qcom_smbb: Replace the deprecated extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (2 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 03/12] power_supply: axp288_charger: Replace the " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 05/12] usb: chipdata: Replace the " Chanwoo Choi
` (7 subsequent siblings)
11 siblings, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
This patch replaces the deprecated extcon API as following:
- extcon_set_cable_state_() -> extcon_set_state_sync()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/power/supply/qcom_smbb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c
index bb91a1c339bc..7b1991265b03 100644
--- a/drivers/power/supply/qcom_smbb.c
+++ b/drivers/power/supply/qcom_smbb.c
@@ -378,7 +378,7 @@ static irqreturn_t smbb_usb_valid_handler(int irq, void *_data)
struct smbb_charger *chg = _data;
smbb_set_line_flag(chg, irq, STATUS_USBIN_VALID);
- extcon_set_cable_state_(chg->edev, EXTCON_USB,
+ extcon_set_state_sync(chg->edev, EXTCON_USB,
chg->status & STATUS_USBIN_VALID);
power_supply_changed(chg->usb_psy);
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH 05/12] usb: chipdata: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (3 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 04/12] power_supply: qcom_smbb: Replace the deprecated " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-12-02 6:59 ` Peter Chen
2016-11-30 5:57 ` [PATCH 06/12] usb: dwc3: omap: " Chanwoo Choi
` (6 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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/chipidea/core.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 69426e644d17..a5b44963eaea 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -742,7 +742,7 @@ static int ci_get_platdata(struct device *dev,
cable->edev = ext_vbus;
if (!IS_ERR(ext_vbus)) {
- ret = extcon_get_cable_state_(cable->edev, EXTCON_USB);
+ ret = extcon_get_state(cable->edev, EXTCON_USB);
if (ret)
cable->state = true;
else
@@ -754,7 +754,7 @@ static int ci_get_platdata(struct device *dev,
cable->edev = ext_id;
if (!IS_ERR(ext_id)) {
- ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST);
+ ret = extcon_get_state(cable->edev, EXTCON_USB_HOST);
if (ret)
cable->state = false;
else
@@ -771,8 +771,8 @@ static int ci_extcon_register(struct ci_hdrc *ci)
id = &ci->platdata->id_extcon;
id->ci = ci;
if (!IS_ERR(id->edev)) {
- ret = extcon_register_notifier(id->edev, EXTCON_USB_HOST,
- &id->nb);
+ ret = devm_extcon_register_notifier(ci->dev, id->edev,
+ EXTCON_USB_HOST, &id->nb);
if (ret < 0) {
dev_err(ci->dev, "register ID failed\n");
return ret;
@@ -782,11 +782,9 @@ static int ci_extcon_register(struct ci_hdrc *ci)
vbus = &ci->platdata->vbus_extcon;
vbus->ci = ci;
if (!IS_ERR(vbus->edev)) {
- ret = extcon_register_notifier(vbus->edev, EXTCON_USB,
- &vbus->nb);
+ ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
+ EXTCON_USB, &vbus->nb);
if (ret < 0) {
- extcon_unregister_notifier(id->edev, EXTCON_USB_HOST,
- &id->nb);
dev_err(ci->dev, "register VBUS failed\n");
return ret;
}
@@ -795,20 +793,6 @@ static int ci_extcon_register(struct ci_hdrc *ci)
return 0;
}
-static void ci_extcon_unregister(struct ci_hdrc *ci)
-{
- struct ci_hdrc_cable *cable;
-
- cable = &ci->platdata->id_extcon;
- if (!IS_ERR(cable->edev))
- extcon_unregister_notifier(cable->edev, EXTCON_USB_HOST,
- &cable->nb);
-
- cable = &ci->platdata->vbus_extcon;
- if (!IS_ERR(cable->edev))
- extcon_unregister_notifier(cable->edev, EXTCON_USB, &cable->nb);
-}
-
static DEFINE_IDA(ci_ida);
struct platform_device *ci_hdrc_add_device(struct device *dev,
@@ -1053,7 +1037,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
if (!ret)
return 0;
- ci_extcon_unregister(ci);
stop:
ci_role_destroy(ci);
deinit_phy:
@@ -1073,7 +1056,6 @@ static int ci_hdrc_remove(struct platform_device *pdev)
}
dbg_remove_files(ci);
- ci_extcon_unregister(ci);
ci_role_destroy(ci);
ci_hdrc_enter_lpm(ci, true);
ci_usb_phy_exit(ci);
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 05/12] usb: chipdata: Replace the extcon API
2016-11-30 5:57 ` [PATCH 05/12] usb: chipdata: Replace the " Chanwoo Choi
@ 2016-12-02 6:59 ` Peter Chen
0 siblings, 0 replies; 34+ messages in thread
From: Peter Chen @ 2016-12-02 6:59 UTC (permalink / raw)
To: Chanwoo Choi
Cc: balbi, gregkh, kishon, sre, Peter.Chen, wens,
yoshihiro.shimoda.uh, maxime.ripard, b-liu, linux-kernel,
linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
On Wed, Nov 30, 2016 at 02:57:33PM +0900, Chanwoo Choi wrote:
> 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/chipidea/core.c | 30 ++++++------------------------
> 1 file changed, 6 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 69426e644d17..a5b44963eaea 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -742,7 +742,7 @@ static int ci_get_platdata(struct device *dev,
> cable->edev = ext_vbus;
>
> if (!IS_ERR(ext_vbus)) {
> - ret = extcon_get_cable_state_(cable->edev, EXTCON_USB);
> + ret = extcon_get_state(cable->edev, EXTCON_USB);
> if (ret)
> cable->state = true;
> else
> @@ -754,7 +754,7 @@ static int ci_get_platdata(struct device *dev,
> cable->edev = ext_id;
>
> if (!IS_ERR(ext_id)) {
> - ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST);
> + ret = extcon_get_state(cable->edev, EXTCON_USB_HOST);
> if (ret)
> cable->state = false;
> else
> @@ -771,8 +771,8 @@ static int ci_extcon_register(struct ci_hdrc *ci)
> id = &ci->platdata->id_extcon;
> id->ci = ci;
> if (!IS_ERR(id->edev)) {
> - ret = extcon_register_notifier(id->edev, EXTCON_USB_HOST,
> - &id->nb);
> + ret = devm_extcon_register_notifier(ci->dev, id->edev,
> + EXTCON_USB_HOST, &id->nb);
> if (ret < 0) {
> dev_err(ci->dev, "register ID failed\n");
> return ret;
> @@ -782,11 +782,9 @@ static int ci_extcon_register(struct ci_hdrc *ci)
> vbus = &ci->platdata->vbus_extcon;
> vbus->ci = ci;
> if (!IS_ERR(vbus->edev)) {
> - ret = extcon_register_notifier(vbus->edev, EXTCON_USB,
> - &vbus->nb);
> + ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
> + EXTCON_USB, &vbus->nb);
> if (ret < 0) {
> - extcon_unregister_notifier(id->edev, EXTCON_USB_HOST,
> - &id->nb);
> dev_err(ci->dev, "register VBUS failed\n");
> return ret;
> }
> @@ -795,20 +793,6 @@ static int ci_extcon_register(struct ci_hdrc *ci)
> return 0;
> }
>
> -static void ci_extcon_unregister(struct ci_hdrc *ci)
> -{
> - struct ci_hdrc_cable *cable;
> -
> - cable = &ci->platdata->id_extcon;
> - if (!IS_ERR(cable->edev))
> - extcon_unregister_notifier(cable->edev, EXTCON_USB_HOST,
> - &cable->nb);
> -
> - cable = &ci->platdata->vbus_extcon;
> - if (!IS_ERR(cable->edev))
> - extcon_unregister_notifier(cable->edev, EXTCON_USB, &cable->nb);
> -}
> -
> static DEFINE_IDA(ci_ida);
>
> struct platform_device *ci_hdrc_add_device(struct device *dev,
> @@ -1053,7 +1037,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
> if (!ret)
> return 0;
>
> - ci_extcon_unregister(ci);
> stop:
> ci_role_destroy(ci);
> deinit_phy:
> @@ -1073,7 +1056,6 @@ static int ci_hdrc_remove(struct platform_device *pdev)
> }
>
> dbg_remove_files(ci);
> - ci_extcon_unregister(ci);
> ci_role_destroy(ci);
> ci_hdrc_enter_lpm(ci, true);
> ci_usb_phy_exit(ci);
> --
Acked-by: Peter Chen <peter.chen@nxp.com>
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (4 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 05/12] usb: chipdata: Replace the " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:36 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier Chanwoo Choi
` (5 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-11-30 5:57 ` [PATCH 06/12] usb: dwc3: omap: " Chanwoo Choi
@ 2016-11-30 10:36 ` Felipe Balbi
2016-12-02 7:52 ` Chanwoo Choi
0 siblings, 1 reply; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:36 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-11-30 10:36 ` Felipe Balbi
@ 2016-12-02 7:52 ` Chanwoo Choi
2016-12-02 9:03 ` Felipe Balbi
0 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-02 7:52 UTC (permalink / raw)
To: Felipe Balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-12-02 7:52 ` Chanwoo Choi
@ 2016-12-02 9:03 ` Felipe Balbi
2016-12-02 13:20 ` Chanwoo Choi
2016-12-30 2:46 ` Chanwoo Choi
0 siblings, 2 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-12-02 9:03 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-12-02 9:03 ` Felipe Balbi
@ 2016-12-02 13:20 ` Chanwoo Choi
2016-12-30 2:46 ` Chanwoo Choi
1 sibling, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-02 13:20 UTC (permalink / raw)
To: Felipe Balbi
Cc: Chanwoo Choi, Greg KH, Kishon Vijay Abraham I, Sebastian Reichel,
Peter Chen, Chen-Yu Tsai, yoshihiro.shimoda.uh, Maxime Ripard,
b-liu, linux-kernel, linux-arm-kernel, linux-pm, linux-usb,
Linux OMAP Mailing List, linux-renesas-soc
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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-12-02 9:03 ` Felipe Balbi
2016-12-02 13:20 ` Chanwoo Choi
@ 2016-12-30 2:46 ` Chanwoo Choi
2016-12-30 6:45 ` Chanwoo Choi
1 sibling, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-30 2:46 UTC (permalink / raw)
To: Felipe Balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
Hi Felipe,
On 2016년 12월 02일 18:03, Felipe Balbi wrote:
>
> 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
Could you please pick up these patches(patch6/8/9/10/11/12)?
These patches were already reviewed by you.
--
Regards,
Chanwoo Choi
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 06/12] usb: dwc3: omap: Replace the extcon API
2016-12-30 2:46 ` Chanwoo Choi
@ 2016-12-30 6:45 ` Chanwoo Choi
0 siblings, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-30 6:45 UTC (permalink / raw)
To: Felipe Balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
Hi Felipe,
On 2016년 12월 30일 11:46, Chanwoo Choi wrote:
> Hi Felipe,
>
> On 2016년 12월 02일 18:03, Felipe Balbi wrote:
>>
>> 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
>
> Could you please pick up these patches(patch6/8/9/10/11/12)?
> These patches were already reviewed by you.
>
I sent v2 patchset.
[1] https://www.spinics.net/lists/kernel/msg2410950.html
- "[PATCH v2 0/6] usb: Replace the deprecated extcon API"
--
Regards,
Chanwoo Choi
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (5 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 06/12] usb: dwc3: omap: " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 8:45 ` Maxime Ripard
2016-11-30 5:57 ` [PATCH 08/12] usb: phy: msm: Replace the extcon API Chanwoo Choi
` (4 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
This patch just uses the resource-managed extcon API when registering
the extcon notifier.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/musb/sunxi.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index 1408245be18e..4b531551e49d 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -261,14 +261,14 @@ static int sunxi_musb_init(struct musb *musb)
writeb(SUNXI_MUSB_VEND0_PIO_MODE, musb->mregs + SUNXI_MUSB_VEND0);
/* Register notifier before calling phy_init() */
- ret = extcon_register_notifier(glue->extcon, EXTCON_USB_HOST,
- &glue->host_nb);
+ ret = devm_extcon_register_notifier(glue->dev, glue->extcon,
+ EXTCON_USB_HOST, &glue->host_nb);
if (ret)
goto error_reset_assert;
ret = phy_init(glue->phy);
if (ret)
- goto error_unregister_notifier;
+ goto error_reset_assert;
musb->isr = sunxi_musb_interrupt;
@@ -277,9 +277,6 @@ static int sunxi_musb_init(struct musb *musb)
return 0;
-error_unregister_notifier:
- extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST,
- &glue->host_nb);
error_reset_assert:
if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags))
reset_control_assert(glue->rst);
@@ -303,9 +300,6 @@ static int sunxi_musb_exit(struct musb *musb)
phy_exit(glue->phy);
- extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST,
- &glue->host_nb);
-
if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags))
reset_control_assert(glue->rst);
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier
2016-11-30 5:57 ` [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier Chanwoo Choi
@ 2016-11-30 8:45 ` Maxime Ripard
2016-12-05 16:32 ` Bin Liu
0 siblings, 1 reply; 34+ messages in thread
From: Maxime Ripard @ 2016-11-30 8:45 UTC (permalink / raw)
To: Chanwoo Choi
Cc: balbi, gregkh, kishon, sre, Peter.Chen, wens,
yoshihiro.shimoda.uh, b-liu, linux-kernel, linux-arm-kernel,
linux-pm, linux-usb, linux-omap, linux-renesas-soc, chanwoo
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
On Wed, Nov 30, 2016 at 02:57:35PM +0900, Chanwoo Choi wrote:
> This patch just uses the resource-managed extcon API when registering
> the extcon notifier.
>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier
2016-11-30 8:45 ` Maxime Ripard
@ 2016-12-05 16:32 ` Bin Liu
2016-12-06 0:21 ` Chanwoo Choi
0 siblings, 1 reply; 34+ messages in thread
From: Bin Liu @ 2016-12-05 16:32 UTC (permalink / raw)
To: Maxime Ripard
Cc: Chanwoo Choi, balbi, gregkh, kishon, sre, Peter.Chen, wens,
yoshihiro.shimoda.uh, linux-kernel, linux-arm-kernel, linux-pm,
linux-usb, linux-omap, linux-renesas-soc, chanwoo
On Wed, Nov 30, 2016 at 09:45:03AM +0100, Maxime Ripard wrote:
> On Wed, Nov 30, 2016 at 02:57:35PM +0900, Chanwoo Choi wrote:
> > This patch just uses the resource-managed extcon API when registering
> > the extcon notifier.
> >
> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
It would be ideal if the subject was "usb: musb: sunxi: ...".
Acked-by: Bin Liu <b-liu@ti.com>
Regards,
-Bin.
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier
2016-12-05 16:32 ` Bin Liu
@ 2016-12-06 0:21 ` Chanwoo Choi
0 siblings, 0 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-12-06 0:21 UTC (permalink / raw)
To: Bin Liu, Maxime Ripard, balbi, gregkh, kishon, sre, Peter.Chen,
wens, yoshihiro.shimoda.uh, linux-kernel, linux-arm-kernel,
linux-pm, linux-usb, linux-omap, linux-renesas-soc, chanwoo
On 2016년 12월 06일 01:32, Bin Liu wrote:
> On Wed, Nov 30, 2016 at 09:45:03AM +0100, Maxime Ripard wrote:
>> On Wed, Nov 30, 2016 at 02:57:35PM +0900, Chanwoo Choi wrote:
>>> This patch just uses the resource-managed extcon API when registering
>>> the extcon notifier.
>>>
>>> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
>>
>> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> It would be ideal if the subject was "usb: musb: sunxi: ...".
>
> Acked-by: Bin Liu <b-liu@ti.com>
>
Thanks for the review. I'll change the subject.
--
Best Regards,
Chanwoo Choi
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 08/12] usb: phy: msm: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (6 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:40 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 09/12] usb: phy: omap-otg: " Chanwoo Choi
` (3 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 08/12] usb: phy: msm: Replace the extcon API
2016-11-30 5:57 ` [PATCH 08/12] usb: phy: msm: Replace the extcon API Chanwoo Choi
@ 2016-11-30 10:40 ` Felipe Balbi
0 siblings, 0 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:40 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 09/12] usb: phy: omap-otg: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (7 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 08/12] usb: phy: msm: Replace the extcon API Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:41 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 10/12] usb: phy: qcom-8x16-usb: " Chanwoo Choi
` (2 subsequent siblings)
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 09/12] usb: phy: omap-otg: Replace the extcon API
2016-11-30 5:57 ` [PATCH 09/12] usb: phy: omap-otg: " Chanwoo Choi
@ 2016-11-30 10:41 ` Felipe Balbi
0 siblings, 0 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:41 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (8 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 09/12] usb: phy: omap-otg: " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:42 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 11/12] usb: phy: tahvo: Replace the deprecated " Chanwoo Choi
2016-11-30 5:57 ` [PATCH 12/12] usb: renesas_usbhs: " Chanwoo Choi
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 10/12] usb: phy: qcom-8x16-usb: Replace the extcon API
2016-11-30 5:57 ` [PATCH 10/12] usb: phy: qcom-8x16-usb: " Chanwoo Choi
@ 2016-11-30 10:42 ` Felipe Balbi
0 siblings, 0 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:42 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 11/12] usb: phy: tahvo: Replace the deprecated extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (9 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 10/12] usb: phy: qcom-8x16-usb: " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:42 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 12/12] usb: renesas_usbhs: " Chanwoo Choi
11 siblings, 1 reply; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
This patch replaces the deprecated extcon API as following:
- extcon_set_cable_state_() -> extcon_set_state_sync()
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/usb/phy/phy-tahvo.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 1343bff004eb..9a7822e12156 100644
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -121,7 +121,7 @@ static void check_vbus_state(struct tahvo_usb *tu)
prev_state = tu->vbus_state;
tu->vbus_state = reg & TAHVO_STAT_VBUS;
if (prev_state != tu->vbus_state) {
- extcon_set_cable_state_(tu->extcon, EXTCON_USB, tu->vbus_state);
+ extcon_set_state_sync(tu->extcon, EXTCON_USB, tu->vbus_state);
sysfs_notify(&tu->pt_dev->dev.kobj, NULL, "vbus_state");
}
}
@@ -130,7 +130,7 @@ static void tahvo_usb_become_host(struct tahvo_usb *tu)
{
struct retu_dev *rdev = dev_get_drvdata(tu->pt_dev->dev.parent);
- extcon_set_cable_state_(tu->extcon, EXTCON_USB_HOST, true);
+ extcon_set_state_sync(tu->extcon, EXTCON_USB_HOST, true);
/* Power up the transceiver in USB host mode */
retu_write(rdev, TAHVO_REG_USBR, USBR_REGOUT | USBR_NSUSPEND |
@@ -149,7 +149,7 @@ static void tahvo_usb_become_peripheral(struct tahvo_usb *tu)
{
struct retu_dev *rdev = dev_get_drvdata(tu->pt_dev->dev.parent);
- extcon_set_cable_state_(tu->extcon, EXTCON_USB_HOST, false);
+ extcon_set_state_sync(tu->extcon, EXTCON_USB_HOST, false);
/* Power up transceiver and set it in USB peripheral mode */
retu_write(rdev, TAHVO_REG_USBR, USBR_SLAVE_CONTROL | USBR_REGOUT |
@@ -379,9 +379,9 @@ static int tahvo_usb_probe(struct platform_device *pdev)
}
/* Set the initial cable state. */
- extcon_set_cable_state_(tu->extcon, EXTCON_USB_HOST,
+ extcon_set_state_sync(tu->extcon, EXTCON_USB_HOST,
tu->tahvo_mode == TAHVO_MODE_HOST);
- extcon_set_cable_state_(tu->extcon, EXTCON_USB, tu->vbus_state);
+ extcon_set_state_sync(tu->extcon, EXTCON_USB, tu->vbus_state);
/* Create OTG interface */
tahvo_usb_power_off(tu);
--
1.9.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 11/12] usb: phy: tahvo: Replace the deprecated extcon API
2016-11-30 5:57 ` [PATCH 11/12] usb: phy: tahvo: Replace the deprecated " Chanwoo Choi
@ 2016-11-30 10:42 ` Felipe Balbi
0 siblings, 0 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:42 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
Hi,
Chanwoo Choi <cw00.choi@samsung.com> writes:
> This patch replaces the deprecated extcon API as following:
> - extcon_set_cable_state_() -> extcon_set_state_sync()
>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
` (10 preceding siblings ...)
2016-11-30 5:57 ` [PATCH 11/12] usb: phy: tahvo: Replace the deprecated " Chanwoo Choi
@ 2016-11-30 5:57 ` Chanwoo Choi
2016-11-30 10:43 ` Felipe Balbi
2016-12-06 1:35 ` Yoshihiro Shimoda
11 siblings, 2 replies; 34+ messages in thread
From: Chanwoo Choi @ 2016-11-30 5:57 UTC (permalink / raw)
To: balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
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
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API
2016-11-30 5:57 ` [PATCH 12/12] usb: renesas_usbhs: " Chanwoo Choi
@ 2016-11-30 10:43 ` Felipe Balbi
2016-12-06 1:35 ` Yoshihiro Shimoda
1 sibling, 0 replies; 34+ messages in thread
From: Felipe Balbi @ 2016-11-30 10:43 UTC (permalink / raw)
To: Chanwoo Choi, gregkh, kishon, sre
Cc: Peter.Chen, wens, yoshihiro.shimoda.uh, maxime.ripard, b-liu,
linux-kernel, linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, cw00.choi, chanwoo
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 34+ messages in thread
* RE: [PATCH 12/12] usb: renesas_usbhs: Replace the deprecated extcon API
2016-11-30 5:57 ` [PATCH 12/12] usb: renesas_usbhs: " Chanwoo Choi
2016-11-30 10:43 ` Felipe Balbi
@ 2016-12-06 1:35 ` Yoshihiro Shimoda
1 sibling, 0 replies; 34+ messages in thread
From: Yoshihiro Shimoda @ 2016-12-06 1:35 UTC (permalink / raw)
To: Chanwoo Choi, balbi, gregkh, kishon, sre
Cc: Peter.Chen, wens, maxime.ripard, b-liu, linux-kernel,
linux-arm-kernel, linux-pm, linux-usb, linux-omap,
linux-renesas-soc, chanwoo
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
^ permalink raw reply [flat|nested] 34+ messages in thread