FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 03:48:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: chipdata: Replace the extcon API

Browse Source 
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>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
This commit is contained in:
Chanwoo Choi 2016-11-30 14:57:33 +09:00 committed by Peter Chen
parent 7ce7d89f48
commit 3f991aa0b6
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/chipidea/core.c
View File

@ -742,7 +742,7 @@ static int ci_get_platdata(struct device *dev,
cable->edev = ext_vbus; cable->edev = ext_vbus;
if (!IS_ERR(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) if (ret)
cable->state = true; cable->state = true;
else else
@ -754,7 +754,7 @@ static int ci_get_platdata(struct device *dev,
cable->edev = ext_id; cable->edev = ext_id;
if (!IS_ERR(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) if (ret)
cable->state = false; cable->state = false;
else else
@ -771,8 +771,8 @@ static int ci_extcon_register(struct ci_hdrc *ci)
id = &ci->platdata->id_extcon; id = &ci->platdata->id_extcon;
id->ci = ci; id->ci = ci;
if (!IS_ERR(id->edev)) { if (!IS_ERR(id->edev)) {
ret = extcon_register_notifier(id->edev, EXTCON_USB_HOST, ret = devm_extcon_register_notifier(ci->dev, id->edev,
&id->nb); EXTCON_USB_HOST, &id->nb);
if (ret < 0) { if (ret < 0) {
dev_err(ci->dev, "register ID failed\n"); dev_err(ci->dev, "register ID failed\n");
return ret; return ret;
@ -782,11 +782,9 @@ static int ci_extcon_register(struct ci_hdrc *ci)
vbus = &ci->platdata->vbus_extcon; vbus = &ci->platdata->vbus_extcon;
vbus->ci = ci; vbus->ci = ci;
if (!IS_ERR(vbus->edev)) { if (!IS_ERR(vbus->edev)) {
ret = extcon_register_notifier(vbus->edev, EXTCON_USB, ret = devm_extcon_register_notifier(ci->dev, vbus->edev,
&vbus->nb); EXTCON_USB, &vbus->nb);
if (ret < 0) { if (ret < 0) {
extcon_unregister_notifier(id->edev, EXTCON_USB_HOST,
&id->nb);
dev_err(ci->dev, "register VBUS failed\n"); dev_err(ci->dev, "register VBUS failed\n");
return ret; return ret;
} }
@ -795,20 +793,6 @@ static int ci_extcon_register(struct ci_hdrc *ci)
return 0; 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); static DEFINE_IDA(ci_ida);
struct platform_device *ci_hdrc_add_device(struct device *dev, 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) if (!ret)
return 0; return 0;
ci_extcon_unregister(ci);
stop: stop:
ci_role_destroy(ci); ci_role_destroy(ci);
deinit_phy: deinit_phy:
@ -1074,7 +1057,6 @@ static int ci_hdrc_remove(struct platform_device *pdev)
} }
dbg_remove_files(ci); dbg_remove_files(ci);
ci_extcon_unregister(ci);
ci_role_destroy(ci); ci_role_destroy(ci);
ci_hdrc_enter_lpm(ci, true); ci_hdrc_enter_lpm(ci, true);
ci_usb_phy_exit(ci); ci_usb_phy_exit(ci);