From: Fan Fei Date: Thu, 23 Dec 2021 01:10:33 +0000 (-0600) Subject: PCI: artpec6: Prefer of_device_get_match_data() X-Git-Tag: v5.17-rc1~73^2^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7073f2ceca380bcba5caa2110e86d62fff6e430c;p=thirdparty%2Flinux.git PCI: artpec6: Prefer of_device_get_match_data() The artpec6 driver only needs the device data, not the whole struct of_device_id. Use of_device_get_match_data() instead of of_match_device(). No functional change intended. [bhelgaas: commit log] Link: https://lore.kernel.org/r/20211223011054.1227810-3-helgaas@kernel.org Signed-off-by: Fan Fei Signed-off-by: Bjorn Helgaas Acked-by: Jesper Nilsson --- diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c index c91fc1954432a..2f15441770e10 100644 --- a/drivers/pci/controller/dwc/pcie-artpec6.c +++ b/drivers/pci/controller/dwc/pcie-artpec6.c @@ -380,17 +380,15 @@ static int artpec6_pcie_probe(struct platform_device *pdev) struct dw_pcie *pci; struct artpec6_pcie *artpec6_pcie; int ret; - const struct of_device_id *match; const struct artpec_pcie_of_data *data; enum artpec_pcie_variants variant; enum dw_pcie_device_mode mode; u32 val; - match = of_match_device(artpec6_pcie_of_match, dev); - if (!match) + data = of_device_get_match_data(dev); + if (!data) return -EINVAL; - data = (struct artpec_pcie_of_data *)match->data; variant = (enum artpec_pcie_variants)data->variant; mode = (enum dw_pcie_device_mode)data->mode;