From patchwork Thu Jan 26 09:29:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9538639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28FDF604A0 for ; Thu, 26 Jan 2017 09:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B35326E77 for ; Thu, 26 Jan 2017 09:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FB2828112; Thu, 26 Jan 2017 09:30:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B449626E77 for ; Thu, 26 Jan 2017 09:30:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753324AbdAZJaR (ORCPT ); Thu, 26 Jan 2017 04:30:17 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:26843 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753298AbdAZJaG (ORCPT ); Thu, 26 Jan 2017 04:30:06 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKD00611RQ21G70@mailout1.w1.samsung.com>; Thu, 26 Jan 2017 09:30:02 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170126093001eucas1p2b8fc96dc87a4073e224be37853f43623~dSFmbShmB1108211082eucas1p2X; Thu, 26 Jan 2017 09:30:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id C2.7D.28517.991C9885; Thu, 26 Jan 2017 09:30:01 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170126093001eucas1p23c2d5d589a0490fc19dde1be37250a00~dSFlxNW4I0738807388eucas1p2k; Thu, 26 Jan 2017 09:30:01 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-18-5889c199caa4 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8B.FC.06687.9D1C9885; Thu, 26 Jan 2017 09:31:05 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OKD007J9RPVXW40@eusync3.samsung.com>; Thu, 26 Jan 2017 09:30:01 +0000 (GMT) From: Marek Szyprowski To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Linus Walleij , Tomasz Figa , Bartlomiej Zolnierkiewicz Subject: [PATCH v3 REBASED 09/13] pinctrl: samsung: Use generic of_device_get_match_data helper Date: Thu, 26 Jan 2017 10:29:23 +0100 Message-id: <1485422967-30643-6-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1485422967-30643-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsWy7djPc7ozD3ZGGKxdpWixccZ6Vovz5zew W0z5s5zJYtPja6wWm+f/YbT43HuE0WLG+X1MFmuP3GW3OPymndVi1a4/jA5cHjtn3WX32LSq k83jzrU9bB6bl9R79G1ZxejxeZNcAFsUl01Kak5mWWqRvl0CV8aUjc+YC3byVjx9+5m1gXEj dxcjJ4eEgInEyld/mSBsMYkL99azdTFycQgJLGWUuDvpEQuE85lRonX/YXaYjk3fF4F1CAks Y5TY8yELoqiBSeLn4UUsIAk2AUOJrrddYKNEBJoZJWbe3csO4jAL9DFJfN68lxGkSlggUeLb 631go1gEVCVON3SDreAV8JCYffgDG8Q6OYmTxyazgticAp4S+5u2gQ2SEOhnlzg2cz1QggPI kZXYdIAZot5FYsa7CywQtrDEq+NboM6WkejsOAj1aD+jRFOrNoQ9g1Hi3FteCNta4vDxi2C7 mAX4JCZtm84MMZ5XoqNNCKLEQ+LdsQlQpzlK/L10Fxpejxkl1u75wDSBUWYBI8MqRpHU0uLc 9NRiE73ixNzi0rx0veT83E2MwEg//e/4lx2Mi49ZHWIU4GBU4uE9sKMjQog1say4MvcQowQH s5II76F9nRFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEefcsuBIuJJCeWJKanZpakFoEk2Xi4JRq YJQ5auyxXHLp9wmZsfoLcn3WuX5c2uzWlOLavrV5mb4vu3bI69zatjvXjnsqKF3q7A2Xst7+ 8fTcoqbwxMgnXVfO2k0Tnab1lqdXudxbwOTv4qcSzUf1XU7lcH28rR506Net567pirmTd4na NixZd9hGanIXx9Fnrbd1pA8axRxmfLJ6qve+xUosxRmJhlrMRcWJAFiss1bwAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsVy+t/xq7o3D3ZGGHw4xWSxccZ6Vovz5zew W0z5s5zJYtPja6wWm+f/YbT43HuE0WLG+X1MFmuP3GW3OPymndVi1a4/jA5cHjtn3WX32LSq k83jzrU9bB6bl9R79G1ZxejxeZNcAFuUm01GamJKapFCal5yfkpmXrqtUmiIm66FkkJeYm6q rVKErm9IkJJCWWJOKZBnZIAGHJwD3IOV9O0S3DKmbHzGXLCTt+Lp28+sDYwbubsYOTkkBEwk Nn1fxARhi0lcuLeerYuRi0NIYAmjxNkfL1lAEkICTUwSeyZIg9hsAoYSXW+7wIpEBJoZJRqW 9II5zAITmCRmfmoAGyUskCjx7fU+MJtFQFXidEM3O4jNK+AhMfvwBzaIdXISJ49NZgWxOQU8 JfY3bWOH2DaRUeLo7OwJjLwLGBlWMYqklhbnpucWG+oVJ+YWl+al6yXn525iBAb9tmM/N+9g vLQx+BCjAAejEg/vgR0dEUKsiWXFlbmHGCU4mJVEeA/t64wQ4k1JrKxKLcqPLyrNSS0+xGgK dNREZinR5HxgROaVxBuaGJpbGhoZW1iYGxkpifOWfLgSLiSQnliSmp2aWpBaBNPHxMEp1cDI MEOgcefxcMsDUrcmnzUx3NbPuDiHdZGCctYHQ+c9iyyn/5+ybuWVXE+nM3Usb8okheUKM7Pd fjX5HFapNf0WcEB35WX/xFPT//i49Ectdt9/ZMe0r/U1z3jnnd3DNMMzxmtBwSr7wBnVd566 197vYDlz2etizUZh3uiJyRPKJe1Kd210+WetxFKckWioxVxUnAgAYTUylpACAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170126093001eucas1p23c2d5d589a0490fc19dde1be37250a00 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170126093001eucas1p23c2d5d589a0490fc19dde1be37250a00 X-RootMTR: 20170126093001eucas1p23c2d5d589a0490fc19dde1be37250a00 References: <1485422967-30643-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace custom code with generic helper. Signed-off-by: Marek Szyprowski Reviewed-by: Krzysztof Kozlowski Acked-by: Tomasz Figa --- drivers/pinctrl/samsung/pinctrl-samsung.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 2803ae57f373..59f99ea7e65b 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -955,15 +956,12 @@ static int samsung_gpiolib_unregister(struct platform_device *pdev, return 0; } -static const struct of_device_id samsung_pinctrl_dt_match[]; - /* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, struct platform_device *pdev) { int id; - const struct of_device_id *match; struct device_node *node = pdev->dev.of_node; struct device_node *np; const struct samsung_pin_bank_data *bdata; @@ -978,8 +976,8 @@ static int samsung_gpiolib_unregister(struct platform_device *pdev, dev_err(&pdev->dev, "failed to get alias id\n"); return ERR_PTR(-ENOENT); } - match = of_match_node(samsung_pinctrl_dt_match, node); - ctrl = (struct samsung_pin_ctrl *)match->data + id; + ctrl = of_device_get_match_data(&pdev->dev); + ctrl += id; d->suspend = ctrl->suspend; d->resume = ctrl->resume;