Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[karo-tx-linux.git] / drivers / usb / phy / phy-tahvo.c

diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index ab5d364f6e8c7964e004c01c78b50baf3f32832c..a31c8682e99864e57dcb66d0db7c1f1b249d4de9 100644 (file)
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -121,7 +121,7 @@ static void check_vbus_state(struct tahvo_usb *tu)
        prev_state = tu->vbus_state;
        tu->vbus_state = reg & TAHVO_STAT_VBUS;
        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");
        }
 }
@@ -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);
 
-       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 */
        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);
 
-       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 */
        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. */
-       extcon_set_cable_state_(tu->extcon, EXTCON_USB_HOST,
+       extcon_set_state_sync(tu->extcon, EXTCON_USB_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 */
        tahvo_usb_power_off(tu);