mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 09:56:00 +00:00
usb: chipdata: Replace the extcon API
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:
parent
7ce7d89f48
commit
3f991aa0b6
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user