All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Szyprowski <m.szyprowski@samsung.com>
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 <m.szyprowski@samsung.com>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>,
	Tomasz Figa <tomasz.figa@gmail.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH v2 09/13] pinctrl: samsung: Use generic of_device_get_match_data helper
Date: Tue, 17 Jan 2017 13:44:40 +0100	[thread overview]
Message-ID: <1484657084-26227-10-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1484657084-26227-1-git-send-email-m.szyprowski@samsung.com>

Replace custom code with generic helper.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
---
 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 <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/irqdomain.h>
+#include <linux/of_device.h>
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
 
@@ -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;
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: m.szyprowski@samsung.com (Marek Szyprowski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 09/13] pinctrl: samsung: Use generic of_device_get_match_data helper
Date: Tue, 17 Jan 2017 13:44:40 +0100	[thread overview]
Message-ID: <1484657084-26227-10-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1484657084-26227-1-git-send-email-m.szyprowski@samsung.com>

Replace custom code with generic helper.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
---
 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 <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/irqdomain.h>
+#include <linux/of_device.h>
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
 
@@ -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;
-- 
1.9.1

  parent reply	other threads:[~2017-01-17 12:44 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20170117124453eucas1p1b812596939db4c4f3298b941555eb05a@eucas1p1.samsung.com>
2017-01-17 12:44 ` [PATCH v2 00/13] Move pad retention control to Exynos pin controller driver Marek Szyprowski
2017-01-17 12:44   ` Marek Szyprowski
     [not found]   ` <CGME20170117124456eucas1p1d42d11aa2117caed8d89faa8c09e6218@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 01/13] soc: samsung: pmu: Provide global function to get PMU regmap Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-18  8:31       ` Tomasz Figa
2017-01-18  8:31         ` Tomasz Figa
     [not found]   ` <CGME20170117124457eucas1p120dac823e1cd08421cb8d7411a9eebbd@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 02/13] soc: samsung: pmu: Use of_device_get_match_data helper Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124458eucas1p10463c19d77a501284c7302c3b848fecc@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 03/13] soc: samsung: pmu: Remove messages for failed memory allocation Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124459eucas1p10fbae533e4900439b9a5aa32fc94182c@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 04/13] pinctrl: samsung: Document Exynos3250 SoC support Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124459eucas1p160494d6c7509e0d24bfcc73087492430@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 05/13] pinctrl: samsung: Remove messages for failed memory allocation Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124459eucas1p1ead13705d84054c1d69b5d7a9795f0e9@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 06/13] pinctrl: samsung: Fix samsung_pinctrl_create_functions return value Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-17 17:36       ` Krzysztof Kozlowski
2017-01-17 17:36         ` Krzysztof Kozlowski
     [not found]   ` <CGME20170117124500eucas1p1b61ec676f421eae7d28d750a0746a813@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 07/13] pinctrl: samsung: Add missing initconst annotation Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124500eucas1p265447c459ad0ac0a79dc3d3c833d09f6@eucas1p2.samsung.com>
2017-01-17 12:44     ` [PATCH v2 08/13] pinctrl: samsung: Remove dead code Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
     [not found]   ` <CGME20170117124501eucas1p101d1468371db26b0244854e36281b9c9@eucas1p1.samsung.com>
2017-01-17 12:44     ` Marek Szyprowski [this message]
2017-01-17 12:44       ` [PATCH v2 09/13] pinctrl: samsung: Use generic of_device_get_match_data helper Marek Szyprowski
2017-01-17 17:38       ` Krzysztof Kozlowski
2017-01-17 17:38         ` Krzysztof Kozlowski
     [not found]   ` <CGME20170117124501eucas1p2ab3ec2a1dee18486878733826037d071@eucas1p2.samsung.com>
2017-01-17 12:44     ` [PATCH v2 10/13] pinctrl: samsung: Add infrastructure for pin-bank retention control Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-18  8:36       ` Tomasz Figa
2017-01-18  8:36         ` Tomasz Figa
     [not found]   ` <CGME20170117124502eucas1p131b3b424454ee380b0c93899989a51f6@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 11/13] pinctrl: samsung: Move retention control from mach-exynos to the pinctrl driver Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-17 17:48       ` Krzysztof Kozlowski
2017-01-17 17:48         ` Krzysztof Kozlowski
     [not found]   ` <CGME20170117124502eucas1p19ce0cd772fc4295b207b20cdad30485e@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 12/13] pinctrl: samsung: Move retention control from mach-s5pv210 " Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-17 17:54       ` Krzysztof Kozlowski
2017-01-17 17:54         ` Krzysztof Kozlowski
     [not found]   ` <CGME20170117124503eucas1p1f63d709d794c82dcea8082dbb9c0fb3f@eucas1p1.samsung.com>
2017-01-17 12:44     ` [PATCH v2 13/13] pinctrl: samsung: Replace syscore ops with standard platform device pm_ops Marek Szyprowski
2017-01-17 12:44       ` Marek Szyprowski
2017-01-18  8:40   ` [PATCH v2 00/13] Move pad retention control to Exynos pin controller driver Tomasz Figa
2017-01-18  8:40     ` Tomasz Figa
2017-01-18 10:39   ` Linus Walleij
2017-01-18 10:39     ` Linus Walleij
2017-01-18 12:06     ` Krzysztof Kozlowski
2017-01-18 12:06       ` Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1484657084-26227-10-git-send-email-m.szyprowski@samsung.com \
    --to=m.szyprowski@samsung.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=krzk@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=s.nawrocki@samsung.com \
    --cc=tomasz.figa@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.