Skip to contentSkip to conversation

net: wireless: ath10k: Use of_device_get_match_data() helper

PATCH In review Meng Tang 2 participants 2 messages Mar 18, 2022 – Mar 21, 2022

Subsystems (3)
lore
Share & tools
lore

Meng Tang

author
#0 lore raw

PATCH 1/1 net: wireless: ath10k: Use of_device_get_match_data() helper

Only the device data is needed, not the entire struct of_device_id. Use of_device_get_match_data() instead of of_match_device().

---
 drivers/net/wireless/ath/ath10k/ahb.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath10k/ahb.c +3 -6
index ab8f77ae5e66..f0c615fa5614 100644
@@ -728,20 +728,17 @@ static int ath10k_ahb_probe(struct platform_device *pdev)
 	struct ath10k *ar;
 	struct ath10k_ahb *ar_ahb;
 	struct ath10k_pci *ar_pci;
-	const struct of_device_id *of_id;
 	enum ath10k_hw_rev hw_rev;
 	size_t size;
 	int ret;
 	struct ath10k_bus_params bus_params = {};
 
-	of_id = of_match_device(ath10k_ahb_of_match, &pdev->dev);
-	if (!of_id) {
-		dev_err(&pdev->dev, "failed to find matching device tree id\n");
+	hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev);
+	if (!hw_rev) {
+		dev_err(&pdev->dev, "OF data missing\n");
 		return -EINVAL;
 	}
 
-	hw_rev = (enum ath10k_hw_rev)of_id->data;
-
 	size = sizeof(*ar_pci) + sizeof(*ar_ahb);
 	ar = ath10k_core_create(size, &pdev->dev, ATH10K_BUS_AHB,
 				hw_rev, &ath10k_ahb_hif_ops);
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Meng Tang

Only the device data is needed, not the entire struct of_device_id. Use of_device_get_match_data() instead of of_match_device().

Patch applied to ath-next branch of ath.git, thanks.

c4e9705c5012 ath10k: Use of_device_get_match_data() helper

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches