From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F8E4C35240 for ; Thu, 23 Jan 2020 23:29:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8D02207FF for ; Thu, 23 Jan 2020 23:29:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hcYWKNAo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729951AbgAWX3q (ORCPT ); Thu, 23 Jan 2020 18:29:46 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34918 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729534AbgAWX3p (ORCPT ); Thu, 23 Jan 2020 18:29:45 -0500 Received: by mail-pf1-f194.google.com with SMTP id i23so171653pfo.2 for ; Thu, 23 Jan 2020 15:29:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KLJZo46tQPRXDmKRyvfvXMbLAN2h1kL3Vua+/I58BTE=; b=hcYWKNAo8Cy8EeRiueJAEn+mXal6m5OY6GOKQabIHmRKD6AGZLLsfjrNZKv3rt9MFc JTAf6Lqkvg5zu5qR+nH7g7Ou3JUx87svy/KnmRVTQRQNNl+gn/17w+2G1xdrH07eBTrF ey32vEsWdRNpQN0unvqosgXbFWv9VUiHd/tmM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KLJZo46tQPRXDmKRyvfvXMbLAN2h1kL3Vua+/I58BTE=; b=VY7/WUZ2UL6qdxLhQW7X2XHjBG20kQ+ZbNFp845/E76dx0EVeBehrF4mBFeZqoWpDJ xYU1f1yKyPSoXYHXY0ES9xJwGNIj/+TuYVhy0SupN5AjxEhIzeGJu2uBRDDpf1waiOwg gmKLGe8hKe6BozFZ6IdeIB7gl7YhYWW9jaxFkBj1SvYwJiSYH/uVHfAutAyid4+T/oWE ShzkIa0K+ITaury7Fcpn/kIV0yDbgnriorr/kT0AukPvy+mAe3DWkzmMfj2pCWilOWKI 1M4tUEaSpODq60ZuPmX3HUbz7tctGzlR6Z5oq45KEyPc46SZ8C9KkdmhxP6XYz6c4AMW vSZw== X-Gm-Message-State: APjAAAXH+T1ulloXgoDaY7ZA4C5ZIHH81ylEw0UqR47tIWN8HuYrO6rY VV4zj4f6Lf05KNSWOFc0M+1Xuk9rd6gBMw== X-Google-Smtp-Source: APXvYqzGg6/xG/ALOXguOUyZGSJKC0EKTomJZgx4LZsRS1iAXgQ5k6JifZ8wlhHRo551vRDHtc+yCw== X-Received: by 2002:a62:d405:: with SMTP id a5mr661947pfh.254.1579822185284; Thu, 23 Jan 2020 15:29:45 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:fa53:7765:582b:82b9]) by smtp.gmail.com with ESMTPSA id 3sm3973649pjg.27.2020.01.23.15.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 15:29:44 -0800 (PST) From: Stephen Boyd To: Kalle Valo Cc: linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] ath10k: Use device_get_match_data() to simplify code Date: Thu, 23 Jan 2020 15:29:44 -0800 Message-Id: <20200123232944.39247-1-swboyd@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use device_get_match_data() here to simplify the code a bit. Signed-off-by: Stephen Boyd --- drivers/net/wireless/ath/ath10k/snoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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) { -- Sent by a computer, using git, on the internet