wifi: ath11k: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231009172923.2457844-11-robh@kernel.org

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 1215ebdf173a803dceb5e27bf95735b5dfd5181d..235336ef2a7a594514f7f765f39259f8876bb6d1 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -6,6 +6,7 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/of_device.h>
 #include <linux/of.h>
 #include <linux/dma-mapping.h>
@@ -1084,19 +1085,12 @@ static int ath11k_ahb_fw_resource_deinit(struct ath11k_base *ab)
 static int ath11k_ahb_probe(struct platform_device *pdev)
 {
        struct ath11k_base *ab;
-       const struct of_device_id *of_id;
        const struct ath11k_hif_ops *hif_ops;
        const struct ath11k_pci_ops *pci_ops;
        enum ath11k_hw_rev hw_rev;
        int ret;
 
-       of_id = of_match_device(ath11k_ahb_of_match, &pdev->dev);
-       if (!of_id) {
-               dev_err(&pdev->dev, "failed to find matching device tree id\n");
-               return -EINVAL;
-       }
-
-       hw_rev = (uintptr_t)of_id->data;
+       hw_rev = (uintptr_t)device_get_match_data(&pdev->dev);
 
        switch (hw_rev) {
        case ATH11K_HW_IPQ8074: