Merge tag 'usb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-block.git] / drivers / usb / roles / intel-xhci-usb-role-switch.c

diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb/roles/intel-xhci-usb-role-switch.c
index 88d041601c51e08fc37244c249b5ac016f8d25dc..409851306e99295337836db5d0f4f9085213350f 100644 (file)
--- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
+++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
@@ -47,6 +47,10 @@ struct intel_xhci_usb_data {
        bool enable_sw_switch;
 };
 
+static const struct software_node intel_xhci_usb_node = {
+       "intel-xhci-usb-sw",
+};
+
 static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
 {
        struct intel_xhci_usb_data *data = dev_get_drvdata(dev);
@@ -142,17 +146,13 @@ static enum usb_role intel_xhci_usb_get_role(struct device *dev)
        return role;
 }
 
-static const struct usb_role_switch_desc sw_desc = {
-       .set = intel_xhci_usb_set_role,
-       .get = intel_xhci_usb_get_role,
-       .allow_userspace_control = true,
-};
-
 static int intel_xhci_usb_probe(struct platform_device *pdev)
 {
+       struct usb_role_switch_desc sw_desc = { };
        struct device *dev = &pdev->dev;
        struct intel_xhci_usb_data *data;
        struct resource *res;
+       int ret;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
@@ -167,12 +167,23 @@ static int intel_xhci_usb_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, data);
 
+       ret = software_node_register(&intel_xhci_usb_node);
+       if (ret)
+               return ret;
+
+       sw_desc.set = intel_xhci_usb_set_role,
+       sw_desc.get = intel_xhci_usb_get_role,
+       sw_desc.allow_userspace_control = true,
+       sw_desc.fwnode = software_node_fwnode(&intel_xhci_usb_node);
+
        data->enable_sw_switch = !device_property_read_bool(dev,
                                                "sw_switch_disable");
 
        data->role_sw = usb_role_switch_register(dev, &sw_desc);
-       if (IS_ERR(data->role_sw))
+       if (IS_ERR(data->role_sw)) {
+               fwnode_handle_put(sw_desc.fwnode);
                return PTR_ERR(data->role_sw);
+       }
 
        pm_runtime_set_active(dev);
        pm_runtime_enable(dev);
@@ -187,6 +198,8 @@ static int intel_xhci_usb_remove(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
 
        usb_role_switch_unregister(data->role_sw);
+       fwnode_handle_put(software_node_fwnode(&intel_xhci_usb_node));
+
        return 0;
 }