| Message ID | 20200123232944.39247-1-swboyd@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa43e99dd4b76201eb323ee3918c68132e8abba9 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath10k: Use device_get_match_data() to simplify code | expand |
Maybe use dev here as well?
> dev_err(&pdev->dev, "failed to find matching device tree id\n");
Justin Capella <justincapella@gmail.com> writes: > Maybe use dev here as well? > >> dev_err(&pdev->dev, "failed to find matching device tree id\n"); I changed that. And also fixed a checkpatch warning: drivers/net/wireless/ath/ath10k/snoc.c:1483: Please don't use multiple blank lines
Stephen Boyd <swboyd@chromium.org> wrote: > 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> Patch applied to ath-next branch of ath.git, thanks. fa43e99dd4b7 ath10k: Use device_get_match_data() to simplify code
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 19a4d053d1de..88900f0399f5 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -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,14 +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 = &pdev->dev; + drv_data = device_get_match_data(dev); + if (!drv_data) { dev_err(&pdev->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) {
Use device_get_match_data() here to simplify the code a bit. Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- drivers/net/wireless/ath/ath10k/snoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)