.. | .. |
---|
1042 | 1042 | int err; |
---|
1043 | 1043 | |
---|
1044 | 1044 | tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host"); |
---|
1045 | | - if (IS_ERR_OR_NULL(tegra->genpd_dev_host)) { |
---|
1046 | | - err = PTR_ERR(tegra->genpd_dev_host) ? : -ENODATA; |
---|
| 1045 | + if (IS_ERR(tegra->genpd_dev_host)) { |
---|
| 1046 | + err = PTR_ERR(tegra->genpd_dev_host); |
---|
1047 | 1047 | dev_err(dev, "failed to get host pm-domain: %d\n", err); |
---|
1048 | 1048 | return err; |
---|
1049 | 1049 | } |
---|
1050 | 1050 | |
---|
1051 | 1051 | tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss"); |
---|
1052 | | - if (IS_ERR_OR_NULL(tegra->genpd_dev_ss)) { |
---|
1053 | | - err = PTR_ERR(tegra->genpd_dev_ss) ? : -ENODATA; |
---|
| 1052 | + if (IS_ERR(tegra->genpd_dev_ss)) { |
---|
| 1053 | + err = PTR_ERR(tegra->genpd_dev_ss); |
---|
1054 | 1054 | dev_err(dev, "failed to get superspeed pm-domain: %d\n", err); |
---|
1055 | 1055 | return err; |
---|
1056 | 1056 | } |
---|
.. | .. |
---|
1175 | 1175 | |
---|
1176 | 1176 | mutex_unlock(&tegra->lock); |
---|
1177 | 1177 | |
---|
| 1178 | + tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion(tegra->padctl, |
---|
| 1179 | + tegra->otg_usb2_port); |
---|
| 1180 | + |
---|
1178 | 1181 | if (tegra->host_mode) { |
---|
1179 | 1182 | /* switch to host mode */ |
---|
1180 | 1183 | if (tegra->otg_usb3_port >= 0) { |
---|
.. | .. |
---|
1243 | 1246 | } |
---|
1244 | 1247 | |
---|
1245 | 1248 | tegra->otg_usb2_port = tegra_xusb_get_usb2_port(tegra, usbphy); |
---|
1246 | | - tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion( |
---|
1247 | | - tegra->padctl, |
---|
1248 | | - tegra->otg_usb2_port); |
---|
1249 | 1249 | |
---|
1250 | 1250 | tegra->host_mode = (usbphy->last_event == USB_EVENT_ID) ? true : false; |
---|
1251 | 1251 | |
---|