From: Guenter Roeck <linux@roeck-us.net> To: Krzysztof Kozlowski <krzk@kernel.org>, Kukjin Kim <kgene@kernel.org>, Javier Martinez Canillas <javier@osg.samsung.com>, Wim Van Sebroeck <wim@iguana.be>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Date: Tue, 14 Mar 2017 06:48:21 -0700 [thread overview] Message-ID: <70c9cc8f-e527-ef4b-d003-1ef8f1bffdda@roeck-us.net> (raw) In-Reply-To: <20170313190726.2988-3-krzk@kernel.org> On 03/13/2017 12:07 PM, Krzysztof Kozlowski wrote: > 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> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > 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 52b66bcdd1ef..0532dc93e600 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 (struct s3c2410_wdt_variant *)match->data; > - } else { > - return (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 = (struct s3c2410_wdt_variant *) > + platform_get_device_id(pdev)->driver_data; > } > + > + return variant; > } > > static int s3c2410wdt_probe(struct platform_device *pdev) >
WARNING: multiple messages have this Message-ID (diff)
From: linux@roeck-us.net (Guenter Roeck) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Date: Tue, 14 Mar 2017 06:48:21 -0700 [thread overview] Message-ID: <70c9cc8f-e527-ef4b-d003-1ef8f1bffdda@roeck-us.net> (raw) In-Reply-To: <20170313190726.2988-3-krzk@kernel.org> On 03/13/2017 12:07 PM, Krzysztof Kozlowski wrote: > 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> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > 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 52b66bcdd1ef..0532dc93e600 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 (struct s3c2410_wdt_variant *)match->data; > - } else { > - return (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 = (struct s3c2410_wdt_variant *) > + platform_get_device_id(pdev)->driver_data; > } > + > + return variant; > } > > static int s3c2410wdt_probe(struct platform_device *pdev) >
next prev parent reply other threads:[~2017-03-14 13:48 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-13 19:07 [PATCH v3 0/3] watchdog: s3c2410: Minor cleanups Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski 2017-03-13 19:07 ` [PATCH v3 1/3] watchdog: s3c2410: Constify local structures Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski [not found] ` <CGME20170314131158epcas5p3ca1212cc3ce89b0666cafc3aaa87fb78@epcas5p3.samsung.com> 2017-03-14 13:11 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:11 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:11 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:47 ` Guenter Roeck 2017-03-14 13:47 ` Guenter Roeck 2017-03-14 13:47 ` Guenter Roeck 2017-03-13 19:07 ` [PATCH v3 2/3] watchdog: s3c2410: Simplify getting driver data Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski [not found] ` <CGME20170314131709epcas5p4e150e0df2a04a3369edf61b2075e2e8f@epcas5p4.samsung.com> 2017-03-14 13:17 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:17 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:17 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:20 ` Krzysztof Kozlowski 2017-03-14 13:20 ` Krzysztof Kozlowski 2017-03-14 13:47 ` Guenter Roeck 2017-03-14 13:47 ` Guenter Roeck 2017-03-14 13:48 ` Guenter Roeck [this message] 2017-03-14 13:48 ` Guenter Roeck 2017-03-13 19:07 ` [PATCH v3 3/3] watchdog: s3c2410: Minor code cleanup Krzysztof Kozlowski 2017-03-13 19:07 ` Krzysztof Kozlowski [not found] ` <CGME20170314132022epcas1p26da7dbe4da6d77ebfc1a8e045ee370de@epcas1p2.samsung.com> 2017-03-14 13:20 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:20 ` Bartlomiej Zolnierkiewicz 2017-03-14 13:49 ` Guenter Roeck 2017-03-14 13:49 ` Guenter Roeck 2017-03-14 13:49 ` 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=70c9cc8f-e527-ef4b-d003-1ef8f1bffdda@roeck-us.net \ --to=linux@roeck-us.net \ --cc=javier@osg.samsung.com \ --cc=kgene@kernel.org \ --cc=krzk@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=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: linkBe 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.