lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 086/343] usb: dwc3: pci: Set the swnode from inside dwc3_pci_quirks()
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ Upstream commit e285cb403994419e997749c9a52b9370884ae0c8 ]

    The quirk handling may need to set some different properties
    which means using a different swnode, move the setting of the swnode
    to inside dwc3_pci_quirks() so that the quirk handling can choose
    a different swnode.

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20220213130524.18748-4-hdegoede@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/dwc3/dwc3-pci.c | 11 ++++-------
    1 file changed, 4 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
    index 06d0e88ec8af..4d9608cc55f7 100644
    --- a/drivers/usb/dwc3/dwc3-pci.c
    +++ b/drivers/usb/dwc3/dwc3-pci.c
    @@ -185,7 +185,8 @@ static const struct software_node dwc3_pci_amd_mr_swnode = {
    .properties = dwc3_pci_mr_properties,
    };

    -static int dwc3_pci_quirks(struct dwc3_pci *dwc)
    +static int dwc3_pci_quirks(struct dwc3_pci *dwc,
    + const struct software_node *swnode)
    {
    struct pci_dev *pdev = dwc->pci;

    @@ -242,7 +243,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
    }
    }

    - return 0;
    + return device_add_software_node(&dwc->dwc3->dev, swnode);
    }

    #ifdef CONFIG_PM
    @@ -307,11 +308,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
    dwc->dwc3->dev.parent = dev;
    ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev));

    - ret = device_add_software_node(&dwc->dwc3->dev, (void *)id->driver_data);
    - if (ret < 0)
    - goto err;
    -
    - ret = dwc3_pci_quirks(dwc);
    + ret = dwc3_pci_quirks(dwc, (void *)id->driver_data);
    if (ret)
    goto err;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-12 11:28    [W:4.134 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site