Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API

[Chanwoo Choi]

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

Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API

[Chanwoo Choi]

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 
> ---
>  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(>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(>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(>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(>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(>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,
> - >cable.nb);
> + ret = devm_extcon_register_notifier(>dev, info->cable.edev,
> + EXTCON_CHG_USB_SDP, >cable.nb);
>   if (ret) {
>   dev_err(>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,
> - >cable.nb);
> + ret = devm_extcon_register_notifier(>dev, info->cable.edev,
> + EXTCON_CHG_USB_CDP, >cable.nb);
>   if (ret) {
>   dev_err(>pdev->dev,
>   "failed to register extcon notifier for CDP %d\n", ret);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_SDP, >cable.nb);
>   return ret;
>   }
>  
> - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
> - >cable.nb);
> + ret = devm_extcon_register_notifier(>dev, info->cable.edev,
> + EXTCON_CHG_USB_DCP, >cable.nb);
>   if (ret) {
>   dev_err(>pdev->dev,
>   "failed to register extcon notifier for DCP %d\n", ret);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_SDP, >cable.nb);
> - extcon_unregister_notifier(info->cable.edev,
> - EXTCON_CHG_USB_CDP, >cable.nb);
>   return ret;
>   }
>  
> @@ -887,13 +881,13 @@ static int axp288_charger_probe(struct platform_device 
> *pdev)
>   /* Register for OTG notification */
>   INIT_WORK(>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,
> ->otg.id_nb);
> + ret = devm_extcon_register_notifier(>dev, info->otg.cable,
> + EXTCON_USB_HOST, >otg.id_nb);
>   if (ret)

[PATCH 03/12] power_supply: axp288_charger: Replace the extcon API

[Chanwoo Choi]

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 
---
 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(>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(>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(>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(>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(>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,
-   >cable.nb);
+   ret = devm_extcon_register_notifier(>dev, info->cable.edev,
+   EXTCON_CHG_USB_SDP, >cable.nb);
if (ret) {
dev_err(>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,
-   >cable.nb);
+   ret = devm_extcon_register_notifier(>dev, info->cable.edev,
+   EXTCON_CHG_USB_CDP, >cable.nb);
if (ret) {
dev_err(>pdev->dev,
"failed to register extcon notifier for CDP %d\n", ret);
-   extcon_unregister_notifier(info->cable.edev,
-   EXTCON_CHG_USB_SDP, >cable.nb);
return ret;
}
 
-   ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_DCP,
-   >cable.nb);
+   ret = devm_extcon_register_notifier(>dev, info->cable.edev,
+   EXTCON_CHG_USB_DCP, >cable.nb);
if (ret) {
dev_err(>pdev->dev,
"failed to register extcon notifier for DCP %d\n", ret);
-   extcon_unregister_notifier(info->cable.edev,
-   EXTCON_CHG_USB_SDP, >cable.nb);
-   extcon_unregister_notifier(info->cable.edev,
-   EXTCON_CHG_USB_CDP, >cable.nb);
return ret;
}
 
@@ -887,13 +881,13 @@ static int axp288_charger_probe(struct platform_device 
*pdev)
/* Register for OTG notification */
INIT_WORK(>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,
-  >otg.id_nb);
+   ret = devm_extcon_register_notifier(>dev, info->otg.cable,
+   EXTCON_USB_HOST, >otg.id_nb);
if (ret)
dev_warn(>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(