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>,
Ulf Hansson <ulf.hansson@linaro.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH 4/9] pinctrl: samsung: Use generic of_device_get_match_data helper
Date: Fri, 23 Dec 2016 13:24:44 +0100 [thread overview]
Message-ID: <1482495889-6201-5-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1482495889-6201-1-git-send-email-m.szyprowski@samsung.com>
Replace custom code with generic helper.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/pinctrl/samsung/pinctrl-samsung.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index 4d9262051ff1..a6c2ea74e0f3 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>
@@ -967,15 +968,13 @@ 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;
+ const struct samsung_pin_ctrl *match_data;
struct device_node *node = pdev->dev.of_node;
struct device_node *np;
const struct samsung_pin_bank_data *bdata;
@@ -990,8 +989,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;
+ match_data = of_device_get_match_data(&pdev->dev);
+ ctrl = match_data + id;
d->suspend = ctrl->suspend;
d->resume = ctrl->resume;
--
1.9.1
next prev parent reply other threads:[~2016-12-23 12:24 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161223122513epcas1p394d93d72d2d32c8910aafd1f6cc6b5e2@epcas1p3.samsung.com>
2016-12-23 12:24 ` [PATCH 0/9] Runtime PM for Exynos pin controller driver Marek Szyprowski
2016-12-23 12:24 ` [PATCH 1/9] ARM: dts: exynos: Add PMU syscon to pinctrl nodes Marek Szyprowski
2016-12-26 5:36 ` Tomasz Figa
2016-12-23 12:24 ` [PATCH 2/9] ARM: dts: exynos: Add pinctrl sleep state for 542x i2s module Marek Szyprowski
2016-12-26 5:39 ` Tomasz Figa
2016-12-23 12:24 ` [PATCH 3/9] pinctrl: samsung: Remove dead code Marek Szyprowski
2016-12-25 12:51 ` Krzysztof Kozlowski
2016-12-26 5:40 ` Tomasz Figa
2016-12-23 12:24 ` Marek Szyprowski [this message]
2016-12-25 12:56 ` [PATCH 4/9] pinctrl: samsung: Use generic of_device_get_match_data helper Krzysztof Kozlowski
2016-12-26 5:44 ` Tomasz Figa
2016-12-26 9:41 ` Krzysztof Kozlowski
2016-12-27 10:28 ` Bartlomiej Zolnierkiewicz
2016-12-23 12:24 ` [PATCH 5/9] pinctrl: samsung: Move retention control from mach-exynos to the pinctrl driver Marek Szyprowski
2016-12-25 13:42 ` Krzysztof Kozlowski
2016-12-27 10:15 ` Marek Szyprowski
2016-12-26 5:55 ` Tomasz Figa
2016-12-27 10:12 ` Marek Szyprowski
2016-12-27 15:39 ` Krzysztof Kozlowski
2016-12-30 9:19 ` Linus Walleij
2016-12-23 12:24 ` [PATCH 6/9] pinctrl: samsung: Replace syscore ops with standard platform device pm_ops Marek Szyprowski
2016-12-25 18:47 ` Krzysztof Kozlowski
2016-12-26 5:57 ` Tomasz Figa
2016-12-27 10:17 ` Marek Szyprowski
2016-12-23 12:24 ` [PATCH 7/9] pinctrl: samsung: Add property to mark pad state as suitable for power down Marek Szyprowski
2016-12-25 19:19 ` Krzysztof Kozlowski
2016-12-26 6:02 ` Tomasz Figa
2016-12-27 10:30 ` Marek Szyprowski
2016-12-27 15:33 ` Krzysztof Kozlowski
2016-12-30 9:23 ` Linus Walleij
2016-12-30 11:55 ` Marek Szyprowski
[not found] ` <bad5ef6a-6132-2029-8581-2e8b27f7a2bd-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2016-12-30 15:05 ` Krzysztof Kozlowski
2016-12-23 12:24 ` [PATCH 8/9] pinctrl: samsung: Add runtime PM support Marek Szyprowski
2016-12-25 19:26 ` Krzysztof Kozlowski
2016-12-26 6:11 ` Tomasz Figa
2016-12-23 12:24 ` [PATCH 9/9] ARM: dts: exynos: Add audio power domain support to Exynos542x SoCs Marek Szyprowski
2016-12-24 10:10 ` [PATCH 0/9] Runtime PM for Exynos pin controller driver Anand Moon
2016-12-27 8:29 ` Marek Szyprowski
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=1482495889-6201-5-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 \
--cc=ulf.hansson@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox