Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pci-dra7xx.c

diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index 279a6fa..dfcdeb4 100644 (file)
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -697,16 +697,14 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)
        struct device_node *np = dev->of_node;
        char name[10];
        struct gpio_desc *reset;
-       const struct of_device_id *match;
        const struct dra7xx_pcie_of_data *data;
        enum dw_pcie_device_mode mode;
        u32 b1co_mode_sel_mask;
 
-       match = of_match_device(of_match_ptr(of_dra7xx_pcie_match), dev);
-       if (!match)
+       data = of_device_get_match_data(dev);
+       if (!data)
                return -EINVAL;
 
-       data = (struct dra7xx_pcie_of_data *)match->data;
        mode = (enum dw_pcie_device_mode)data->mode;
        b1co_mode_sel_mask = data->b1co_mode_sel_mask;