microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

usb: phy: tahvo: Replace the deprecated extcon API 

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>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Chanwoo Choi 2017-01-16 21:37:01 +09:00 коммит произвёл Felipe Balbi
Родитель c773bb0b92
Коммит 746c90857b
1 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
drivers/usb/phy/phy-tahvo.c
Просмотреть файл

@ -121,7 +121,7 @@ static void check_vbus_state(struct tahvo_usb *tu)
prev_state = tu->vbus_state; prev_state = tu->vbus_state;
tu->vbus_state = reg & TAHVO_STAT_VBUS; tu->vbus_state = reg & TAHVO_STAT_VBUS;
if (prev_state != tu->vbus_state) { 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"); 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); 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 */ /* Power up the transceiver in USB host mode */
retu_write(rdev, TAHVO_REG_USBR, USBR_REGOUT | USBR_NSUSPEND | 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); 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 */ /* Power up transceiver and set it in USB peripheral mode */
retu_write(rdev, TAHVO_REG_USBR, USBR_SLAVE_CONTROL | USBR_REGOUT | 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. */ /* 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); 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 */ /* Create OTG interface */
tahvo_usb_power_off(tu); tahvo_usb_power_off(tu);