diff mbox series

[v2,02/23] PCI: artpec6: Prefer of_device_get_match_data()

Message ID 20211223011054.1227810-3-helgaas@kernel.org (mailing list archive)
State Accepted
Delegated to: Lorenzo Pieralisi
Headers show
Series PCI: Name structs, functions consistently | expand

Commit Message

Bjorn Helgaas Dec. 23, 2021, 1:10 a.m. UTC 
From: Fan Fei <ffclaire1224@gmail.com>

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]
Signed-off-by: Fan Fei <ffclaire1224@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: linux-arm-kernel@axis.com
---
 drivers/pci/controller/dwc/pcie-artpec6.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Jesper Nilsson Dec. 25, 2021, 1:30 p.m. UTC | #1 
On Thu, Dec 23, 2021 at 02:10:33AM +0100, Bjorn Helgaas wrote:
> From: Fan Fei <ffclaire1224@gmail.com>
> 
> 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]
> Signed-off-by: Fan Fei <ffclaire1224@gmail.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Looks good to me,

Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>

> Cc: linux-arm-kernel@axis.com

/^JN - Jesper Nilsson
diff mbox series

Patch

diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index c91fc1954432..2f15441770e1 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;