OSDN Git Service

PCI: kirin: Prefer of_device_get_match_data()
authorFan Fei <ffclaire1224@gmail.com>
Thu, 23 Dec 2021 01:10:38 +0000 (19:10 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Jan 2022 21:01:28 +0000 (15:01 -0600)
The kirin 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-8-helgaas@kernel.org
Signed-off-by: Fan Fei <ffclaire1224@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Xiaowei Song <songxiaowei@hisilicon.com>
Cc: Binghui Wang <wangbinghui@hisilicon.com>
drivers/pci/controller/dwc/pcie-kirin.c

index 095afbc..8d6e241 100644 (file)
@@ -773,7 +773,6 @@ static const struct of_device_id kirin_pcie_match[] = {
 static int kirin_pcie_probe(struct platform_device *pdev)
 {
        enum pcie_kirin_phy_type phy_type;
-       const struct of_device_id *of_id;
        struct device *dev = &pdev->dev;
        struct kirin_pcie *kirin_pcie;
        struct dw_pcie *pci;
@@ -784,13 +783,12 @@ static int kirin_pcie_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       of_id = of_match_device(kirin_pcie_match, dev);
-       if (!of_id) {
+       phy_type = (long)of_device_get_match_data(dev);
+       if (!phy_type) {
                dev_err(dev, "OF data missing\n");
                return -EINVAL;
        }
 
-       phy_type = (long)of_id->data;
 
        kirin_pcie = devm_kzalloc(dev, sizeof(struct kirin_pcie), GFP_KERNEL);
        if (!kirin_pcie)