From patchwork Thu Jan 19 13:48:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 91892 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp278259obz; Thu, 19 Jan 2017 05:49:56 -0800 (PST) X-Received: by 10.98.218.9 with SMTP id c9mr10098802pfh.99.1484833796779; Thu, 19 Jan 2017 05:49:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f9si3608146plk.180.2017.01.19.05.49.56; Thu, 19 Jan 2017 05:49:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752855AbdASNty (ORCPT + 4 others); Thu, 19 Jan 2017 08:49:54 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:38073 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752832AbdASNtv (ORCPT ); Thu, 19 Jan 2017 08:49:51 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OK100GPZ51XT970@mailout3.w1.samsung.com>; Thu, 19 Jan 2017 13:49:09 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170119134909eucas1p18dfca77078e73929c05354d035b3072b~bMG2NpPiS0979609796eucas1p1E; Thu, 19 Jan 2017 13:49:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 7B.B7.16908.7D3C0885; Thu, 19 Jan 2017 13:49:11 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170119134908eucas1p1768743f7e2578af5ae47291a6123c3f8~bMG1jotRy0979509795eucas1p1q; Thu, 19 Jan 2017 13:49:08 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-d5-5880c3d7bc08 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id B5.31.06687.E04C0885; Thu, 19 Jan 2017 13:50:06 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OK100BYG51LGB30@eusync1.samsung.com>; Thu, 19 Jan 2017 13:49:08 +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 09/13] pinctrl: samsung: Use generic of_device_get_match_data helper Date: Thu, 19 Jan 2017 14:48:49 +0100 Message-id: <1484833733-16082-10-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1484833733-16082-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsWy7djPc7rXDzdEGNy5qGyxccZ6Vovz5zew W0z5s5zJYtPja6wWm+f/YbT43HuE0WLG+X1MFmuP3GW3OPymndVi1a4/jA5cHjtn3WX32LSq k83jzrU9bB6bl9R79G1ZxejxeZNcAFsUl01Kak5mWWqRvl0CV8aUjc+YC3byVjx9+5m1gXEj dxcjJ4eEgInE+lUXGCFsMYkL99azdTFycQgJLGOUmPP/MxOE85lR4si2pewwHUcvbQezwarm N+tAFDUwSRz/PYcZJMEmYCjR9bYLbJSIQDOjxMy7e9lBHGaBPiaJz5v3gi0UFoiUOLJ5CVCC g4NFQFVi7iFjkDCvgKfEqZff2SC2yUmcPDaZFcTmBIpPndMENlRCoJ9d4syMqWC9EgKyEpsO MEPUu0hceNvFAmELS7w6vgXqahmJzo6DTBB2P6NEU6s2hD2DUeLcW14I21ri8PGLYLuYBfgk Jm2bzgwxnleio00IosRDYvLGo6wQtqPEuk3zWSGen8Mocfr2BuYJjDILGBlWMYqklhbnpqcW G+oVJ+YWl+al6yXn525iBMb56X/H3+9gfNoccohRgINRiYe3o6g+Qog1say4MvcQowQHs5II r83ehggh3pTEyqrUovz4otKc1OJDjNIcLErivHsXXAkXEkhPLEnNTk0tSC2CyTJxcEo1MAqs Kb03wT3p/VFOHm3vTP7TnGLasnO+Wd6K1nq09kJZvX3B/pWctgF3o7J/T922acuR67wfdzXn 2lZHnI+Ns9jkbP/AVK9/9uT3TG/DJL/815u5MXjlGUfj4Cb3trPvbVyFPXXumP5++DZw09fc e1+0f/+QvuRsJH68ePkT/6cfDBqyZWwty5RYijMSDbWYi4oTAUtMfwXvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRmVeSWpSXmKPExsVy+t/xy7p8RxoiDKZusbHYOGM9q8X58xvY Lab8Wc5ksenxNVaLzfP/MFp87j3CaDHj/D4mi7VH7rJbHH7TzmqxatcfRgcuj52z7rJ7bFrV yeZx59oeNo/NS+o9+rasYvT4vEkugC3KzSYjNTEltUghNS85PyUzL91WKTTETddCSSEvMTfV VilC1zckSEmhLDGnFMgzMkADDs4B7sFK+nYJbhlTNj5jLtjJW/H07WfWBsaN3F2MnBwSAiYS Ry9tZ4ewxSQu3FvP1sXIxSEksIRRYuvDzSwQThOTxJk/i8Gq2AQMJbredoFViQg0M0o0LOkF c5gFJjBJzPzUwARSJSwQKXFk8xKgDg4OFgFVibmHjEHCvAKeEqdefmeDWCcncfLYZFYQmxMo PnVOE1hcSMBDYsnSi6wTGHkXMDKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECAz6bcd+bt7B eGlj8CFGAQ5GJR7ejqL6CCHWxLLiytxDjBIczEoivDZ7GyKEeFMSK6tSi/Lji0pzUosPMZoC 3TSRWUo0OR8YkXkl8YYmhuaWhkbGFhbmRkZK4rwlH66ECwmkJ5akZqemFqQWwfQxcXBKNTBO z7ic8pPpG9cSueiL8f2+U105q0yvlcTcvvQ9bLJcVaegeP316CjLc1v/HaiojPszZ2mQjTzb rVNvd8jptCj0p5z6GhJw7dDqY5EWmz4fd2S1m7GdJ0nacY6c68wIzeOdWROnSyze6L9Za9+3 h7zdru8/pf6wYSyrv3n49GyTpR/uKlv9uWGtxFKckWioxVxUnAgAXqkQ55ACAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170119134908eucas1p1768743f7e2578af5ae47291a6123c3f8 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170119134908eucas1p1768743f7e2578af5ae47291a6123c3f8 X-RootMTR: 20170119134908eucas1p1768743f7e2578af5ae47291a6123c3f8 References: <1484833733-16082-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;