[PATCH v2 2/3] watchdog: s3c2410: Simplify getting driver data
Guenter Roeck
linux at roeck-us.net
Sun Mar 12 14:00:50 PDT 2017
On 03/11/2017 09:42 AM, 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 at 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 *)
Please drop the const and rebase to the simplified patch 1/3.
> + platform_get_device_id(pdev)->driver_data;
> }
> +
> + return variant;
> }
>
> static int s3c2410wdt_probe(struct platform_device *pdev)
>
More information about the linux-arm-kernel
mailing list