linux-kernel - Re: [PATCH v2] usb: chipdata: Replace the extcon API

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-id: <58661C8A.7060504@samsung.com>
Date:   Fri, 30 Dec 2016 17:36:26 +0900
From:   Chanwoo Choi <cw00.choi@...sung.com>
To:     Peter.Chen@....com, gregkh@...uxfoundation.org
Cc:     linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
        chanwoo@...nel.org
Subject: Re: [PATCH v2] usb: chipdata: Replace the extcon API

Hi Peter,

Please ignore this patch. After posting this patch, I got that this patch was already merged by you. I'm sorry to make the confusion.

Regards,
Chanwoo Choi

On 2016년 12월 30일 13:15, 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()
> 
> Cc: Peter Chen <Peter.Chen@....com>
> Signed-off-by: Chanwoo Choi <cw00.choi@...sung.com>
> ---
> Changes from v1:
> - Rebase these patches based on v4.10-rc1.
> - Drop the phy/power-supply/dwc3/omap patches.
> 
>  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 3dbb4a21ab44..5c35f25e9bce 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,
> @@ -1054,7 +1038,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:
> @@ -1074,7 +1057,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);
>