struct regulator *vbus;
        struct work_struct work;
        bool extcon_host;
-       bool has_otg_pins;
+       bool uses_otg_pins;
 };
 
 static void rcar_gen3_phy_usb2_work(struct work_struct *work)
        bool is_b_device;
        enum phy_mode cur_mode, new_mode;
 
-       if (!ch->has_otg_pins || !ch->phy->init_count)
+       if (!ch->uses_otg_pins || !ch->phy->init_count)
                return -EIO;
 
        if (!strncmp(buf, "host", strlen("host")))
 {
        struct rcar_gen3_chan *ch = dev_get_drvdata(dev);
 
-       if (!ch->has_otg_pins || !ch->phy->init_count)
+       if (!ch->uses_otg_pins || !ch->phy->init_count)
                return -EIO;
 
        return sprintf(buf, "%s\n", rcar_gen3_is_host(ch) ? "host" :
        writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
 
        /* Initialize otg part */
-       if (channel->has_otg_pins)
+       if (channel->uses_otg_pins)
                rcar_gen3_init_otg(channel);
 
        return 0;
        if (of_usb_get_dr_mode_by_phy(dev->of_node, 0) == USB_DR_MODE_OTG) {
                int ret;
 
-               channel->has_otg_pins = (uintptr_t)of_device_get_match_data(dev);
+               channel->uses_otg_pins = (uintptr_t)of_device_get_match_data(dev);
                channel->extcon = devm_extcon_dev_allocate(dev,
                                                        rcar_gen3_phy_cable);
                if (IS_ERR(channel->extcon))
                dev_err(dev, "Failed to register PHY provider\n");
                ret = PTR_ERR(provider);
                goto error;
-       } else if (channel->has_otg_pins) {
+       } else if (channel->uses_otg_pins) {
                int ret;
 
                ret = device_create_file(dev, &dev_attr_role);
 {
        struct rcar_gen3_chan *channel = platform_get_drvdata(pdev);
 
-       if (channel->has_otg_pins)
+       if (channel->uses_otg_pins)
                device_remove_file(&pdev->dev, &dev_attr_role);
 
        pm_runtime_disable(&pdev->dev);