From: Krzysztof Kozlowski <krzk@kernel.org>
To: Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Javier Martinez Canillas <javier@osg.samsung.com>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/3] watchdog: s3c2410: Simplify getting driver data
Date: Sat, 11 Mar 2017 19:42:54 +0200 [thread overview]
Message-ID: <20170311174255.23327-3-krzk@kernel.org> (raw)
In-Reply-To: <20170311174255.23327-1-krzk@kernel.org>
Simplify the flow in helper function for getting the driver data by
using of_device_get_match_data() and only one if() branch.
The code should be equivalent.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
drivers/watchdog/s3c2410_wdt.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 5eaec319e499..d7ddee0668c3 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -37,6 +37,7 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#include <linux/delay.h>
@@ -510,14 +511,16 @@ static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)
static inline const struct s3c2410_wdt_variant *
s3c2410_get_wdt_drv_data(struct platform_device *pdev)
{
- if (pdev->dev.of_node) {
- const struct of_device_id *match;
- match = of_match_node(s3c2410_wdt_match, pdev->dev.of_node);
- return (const struct s3c2410_wdt_variant *)match->data;
- } else {
- return (const struct s3c2410_wdt_variant *)
- platform_get_device_id(pdev)->driver_data;
+ const struct s3c2410_wdt_variant *variant;
+
+ variant = of_device_get_match_data(&pdev->dev);
+ if (!variant) {
+ /* Device matched by platform_device_id */
+ variant = (const struct s3c2410_wdt_variant *)
+ platform_get_device_id(pdev)->driver_data;
}
+
+ return variant;
}
static int s3c2410wdt_probe(struct platform_device *pdev)
--
2.9.3
next prev parent reply other threads:[~2017-03-11 17:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-11 17:42 [PATCH v2 0/3] watchdog: s3c2410: Minor cleanups Krzysztof Kozlowski
[not found] ` <20170311174255.23327-1-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-11 17:42 ` [PATCH v2 1/3] watchdog: s3c2410: Constify local structures Krzysztof Kozlowski
[not found] ` <20170311174255.23327-2-krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-12 20:56 ` Guenter Roeck
[not found] ` <d91a14cc-d741-f4ff-7411-64d4862b6e50-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2017-03-13 6:47 ` Krzysztof Kozlowski
2017-03-11 17:42 ` Krzysztof Kozlowski [this message]
2017-03-12 21:00 ` [PATCH v2 2/3] watchdog: s3c2410: Simplify getting driver data Guenter Roeck
2017-03-11 17:42 ` [PATCH v2 3/3] watchdog: s3c2410: Minor code cleanup Krzysztof Kozlowski
2017-03-12 21:01 ` Guenter Roeck
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=20170311174255.23327-3-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=javier@osg.samsung.com \
--cc=kgene@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@iguana.be \
/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;
as well as URLs for NNTP newsgroup(s).