diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-09-02 17:34:47 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-29 15:21:39 +0200 |
| commit | 667e6e99538f02ff54eda6145e9cb943c3a91b1c (patch) | |
| tree | 4deff3e5dbf7e3ab6c8fce99a82a86bcbeb345e8 | |
| parent | 9848329bdd5ea9166acd20681b1b7dcffc94c978 (diff) | |
video: mxsfb: simplify parsing
Use the timing count from the parsed struct display_timings instead
of looping through the device tree again.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index 4e0fa2a1cc6d..64fbf77f852a 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -1110,7 +1110,6 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host) struct device *dev = &host->pdev->dev; struct device_node *np = host->pdev->dev.of_node; struct device_node *display_np; - struct device_node *timings_np; struct display_timings *timings = NULL; const char *disp_dev; u32 width; @@ -1171,24 +1170,17 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host) goto put_display_node; } - timings_np = of_find_node_by_name(display_np, - "display-timings"); - if (!timings_np) { - dev_err(dev, "failed to find display-timings node\n"); - ret = -ENOENT; - goto put_display_node; - } - - for (i = 0; i < of_get_child_count(timings_np); i++) { + for (i = 0; i < timings->num_timings; i++) { struct videomode vm; struct fb_videomode fb_vm; ret = videomode_from_timings(timings, &vm, i); if (ret < 0) - goto put_timings_node; + goto put_display_node; + ret = fb_videomode_from_videomode(&vm, &fb_vm); if (ret < 0) - goto put_timings_node; + goto put_display_node; if (!(vm.flags & DISPLAY_FLAGS_DE_HIGH)) fb_vm.sync |= FB_SYNC_OE_LOW_ACT; @@ -1206,8 +1198,6 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host) fb_add_videomode(&fb_vm, &fb_info->modelist); } -put_timings_node: - of_node_put(timings_np); put_display_node: if (timings) kfree(timings); |