ath10k: Use device_get_match_data() to simplify code
authorStephen Boyd <swboyd@chromium.org>
Thu, 23 Jan 2020 23:29:44 +0000 (15:29 -0800)
committerKalle Valo <kvalo@codeaurora.org>
Sun, 26 Jan 2020 14:30:20 +0000 (16:30 +0200)
Use device_get_match_data() here to simplify the code a bit.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath10k/snoc.c

index 2189a0d01f5a61ebcbaf070faf3276fadaad2b69..21081b4a27d7ac83533cdf25b8a0b23f0c269b51 100644 (file)
@@ -1466,7 +1466,6 @@ MODULE_DEVICE_TABLE(of, ath10k_snoc_dt_match);
 static int ath10k_snoc_probe(struct platform_device *pdev)
 {
        const struct ath10k_snoc_drv_priv *drv_data;
-       const struct of_device_id *of_id;
        struct ath10k_snoc *ar_snoc;
        struct device *dev;
        struct ath10k *ar;
@@ -1474,15 +1473,13 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
        int ret;
        u32 i;
 
-       of_id = of_match_device(ath10k_snoc_dt_match, &pdev->dev);
-       if (!of_id) {
-               dev_err(&pdev->dev, "failed to find matching device tree id\n");
+       dev = &pdev->dev;
+       drv_data = device_get_match_data(dev);
+       if (!drv_data) {
+               dev_err(dev, "failed to find matching device tree id\n");
                return -EINVAL;
        }
 
-       drv_data = of_id->data;
-       dev = &pdev->dev;
-
        ret = dma_set_mask_and_coherent(dev, drv_data->dma_mask);
        if (ret) {
                dev_err(dev, "failed to set dma mask: %d\n", ret);