From patchwork Sat May 20 16:02:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 100227 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp781809qge; Sat, 20 May 2017 09:03:50 -0700 (PDT) X-Received: by 10.99.152.9 with SMTP id q9mr15861343pgd.131.1495296229920; Sat, 20 May 2017 09:03:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495296229; cv=none; d=google.com; s=arc-20160816; b=PsIKwJhnGulzOlJ2QEXJ5R43RXYcjALor9j5V7EdRCUUExQyJejYRq/E6YE2rj6nOJ ht3w3gEjac9s5c+PLMpUQ+XwnOQMFOWqjH0+EsyUBbjeVJuVWpS9jw4HL/4AZI6l/KN/ aTvo1AxRpBshZ2tR+YHlopf6ZYfy5hZkLIuR652sh6TlUVTGuNPbzx/+LlXIqH6zhWQX 6HvKH6fk5/jInFTgeNKAJ/IBf9chZJUPYkSxeI9asmOi6lpYDdAQmbFSSzOAtMaSl+3J WxuZe6R0zMRXxvn3mTWC/rPMMpacDYYpjjgKVDKePz0H98iheoJ9jcE44HUmmPevI1vc me+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=zup9bbj9zEV6zIsG9ofc1LNJB4KufEgfm6sddQcoqvs=; b=RDo5BV7uJc3yosibVDSqDSwBpa678BW800LrNPPeYnHmBEd5Vb+iuicCVTrej8nLG0 ASggn7JuyuxIniQptIt5RAOr+ujV+XXOIY3B8gDfphtf4ZhKgw3VcHAvpbu4Ihr7eWCO OUhcW+r7YwczHEMBYTz6l/PcM8OnnucMyYgdUNe8l4Kjpy8M1F7+cn8MVj6leyilNAo1 1Z5GuIbtX+tAx/dsrZq8MloL9m517FFVP6OEm8GUok/PR2OvolRQ96U4IS4uQp0NvQAF mlm85TRcNJcgY3PS8Q2fMq4Nw+tGuiNrDMd0AVkkGF1Jq9oVgoDxo8qDWJtuwQlf5v5N vOGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si11326989pln.15.2017.05.20.09.03.48; Sat, 20 May 2017 09:03:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754304AbdETQDd (ORCPT + 25 others); Sat, 20 May 2017 12:03:33 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:56589 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751528AbdETQDc (ORCPT ); Sat, 20 May 2017 12:03:32 -0400 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id v4KG2Qpl014040; Sun, 21 May 2017 01:02:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v4KG2Qpl014040 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1495296154; bh=zup9bbj9zEV6zIsG9ofc1LNJB4KufEgfm6sddQcoqvs=; h=From:To:Cc:Subject:Date:From; b=wO3z50/rr6wjD9Jq+90gZtCMZ3mf1y17a7vLmJIVw9HiQTZjp7XiHnkQMWzSLfNeA 5dYk6OKi8DfTHEt9mt81oPIfMFI+3MUXAm3OUr8vXyerH+ihRyk/HHTOXDWenKtX64 kvKnNYQK5wgCLWzv4LnO7GWkiLXtTQiWeOSPOxws12ixpCIqxg0/bloJ2H9W67cOik TAsavWysLfIo3DsoqgKwSpnXq02qBAiSRGq/s5hJvRz8hbL680F0cKruQJX3y0H33L 6aMEkU4F3VPHFCUw1VKpnZPxDDO/2J+RAGyKB4KUVE9j8BPkRFIRIpL/wZWMskXo78 +RlPOlNaSmh7w== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-gpio@vger.kernel.org Cc: Masahiro Yamada , Linus Walleij , linux-kernel@vger.kernel.org, Tony Lindgren , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Haojian Zhuang Subject: [PATCH] pinctrl: single: use of_device_get_match_data() to get soc data Date: Sun, 21 May 2017 01:02:17 +0900 Message-Id: <1495296137-6461-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use of_device_get_match_data() instead of of_match_device(). It allows us to remove the forward declaration of pcs_of_match. Signed-off-by: Masahiro Yamada --- drivers/pinctrl/pinctrl-single.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 9c267dc..b8b3d93 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1270,8 +1270,6 @@ static void pcs_free_resources(struct pcs_device *pcs) #endif } -static const struct of_device_id pcs_of_match[]; - static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs) { const char *propname = "pinctrl-single,gpio-range"; @@ -1637,15 +1635,14 @@ static int pcs_quirk_missing_pinctrl_cells(struct pcs_device *pcs, static int pcs_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - const struct of_device_id *match; struct pcs_pdata *pdata; struct resource *res; struct pcs_device *pcs; const struct pcs_soc_data *soc; int ret; - match = of_match_device(pcs_of_match, &pdev->dev); - if (!match) + soc = of_device_get_match_data(&pdev->dev); + if (WARN_ON(!soc)) return -EINVAL; pcs = devm_kzalloc(&pdev->dev, sizeof(*pcs), GFP_KERNEL); @@ -1658,7 +1655,6 @@ static int pcs_probe(struct platform_device *pdev) raw_spin_lock_init(&pcs->lock); mutex_init(&pcs->mutex); INIT_LIST_HEAD(&pcs->gpiofuncs); - soc = match->data; pcs->flags = soc->flags; memcpy(&pcs->socdata, soc, sizeof(*soc));