]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
serial: sh-sci: Use of_device_get_match_data() helper
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 4 Oct 2017 12:21:56 +0000 (14:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Oct 2017 11:57:37 +0000 (13:57 +0200)
Use the of_device_get_match_data() helper instead of open coding.
Note that when used with DT, there's always a valid match.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index 9fde3df1b3a835c4192695880383fbcbf874e62d..c4af4c40065b5d8f3e781ffb91e64b67f223d555 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/scatterlist.h>
@@ -3073,17 +3074,15 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
                                          unsigned int *dev_id)
 {
        struct device_node *np = pdev->dev.of_node;
-       const struct of_device_id *match;
        struct plat_sci_port *p;
        struct sci_port *sp;
+       const void *data;
        int id;
 
        if (!IS_ENABLED(CONFIG_OF) || !np)
                return NULL;
 
-       match = of_match_node(of_sci_match, np);
-       if (!match)
-               return NULL;
+       data = of_device_get_match_data(&pdev->dev);
 
        p = devm_kzalloc(&pdev->dev, sizeof(struct plat_sci_port), GFP_KERNEL);
        if (!p)
@@ -3099,8 +3098,8 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
        sp = &sci_ports[id];
        *dev_id = id;
 
-       p->type = SCI_OF_TYPE(match->data);
-       p->regtype = SCI_OF_REGTYPE(match->data);
+       p->type = SCI_OF_TYPE(data);
+       p->regtype = SCI_OF_REGTYPE(data);
 
        sp->has_rtscts = of_property_read_bool(np, "uart-has-rtscts");