openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

videomode: don't allocate mem in of_get_display_timing() 

Move the allocation of display_timing memory from of_get_display_timing() to
of_get_display_timings(). This allows us to use of_get_display_timing()
in a way that doesn't require dynamic memory allocation.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Tomi Valkeinen 2013-05-16 15:29:06 +03:00
parent 301bc0675b
commit fcf7e6e5bd
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/of_display_timing.c
View File

@ -56,18 +56,13 @@ static int parse_timing_property(struct device_node *np, const char *name,
* of_get_display_timing - parse display_timing entry from device_node * of_get_display_timing - parse display_timing entry from device_node
* @np: device_node with the properties * @np: device_node with the properties
**/ **/
static struct display_timing *of_get_display_timing(struct device_node *np) static int of_get_display_timing(struct device_node *np,
struct display_timing *dt)
{ {
struct display_timing *dt;
u32 val = 0; u32 val = 0;
int ret = 0; int ret = 0;
dt = kzalloc(sizeof(*dt), GFP_KERNEL); memset(dt, 0, sizeof(*dt));
if (!dt) {
pr_err("%s: could not allocate display_timing struct\n",
of_node_full_name(np));
return NULL;
}
ret |= parse_timing_property(np, "hback-porch", &dt->hback_porch); ret |= parse_timing_property(np, "hback-porch", &dt->hback_porch);
ret |= parse_timing_property(np, "hfront-porch", &dt->hfront_porch); ret |= parse_timing_property(np, "hfront-porch", &dt->hfront_porch);
@ -101,11 +96,10 @@ static struct display_timing *of_get_display_timing(struct device_node *np)
if (ret) { if (ret) {
pr_err("%s: error reading timing properties\n", pr_err("%s: error reading timing properties\n",
of_node_full_name(np)); of_node_full_name(np));
kfree(dt); return -EINVAL;
return NULL;
} }
return dt; return 0;
} }
/** /**
@ -174,9 +168,17 @@ struct display_timings *of_get_display_timings(struct device_node *np)
for_each_child_of_node(timings_np, entry) { for_each_child_of_node(timings_np, entry) {
struct display_timing *dt; struct display_timing *dt;
int r;
dt = of_get_display_timing(entry); dt = kzalloc(sizeof(*dt), GFP_KERNEL);
if (!dt) { if (!dt) {
pr_err("%s: could not allocate display_timing struct\n",
of_node_full_name(np));
goto timingfail;
}
r = of_get_display_timing(entry, dt);
if (r) {
/* /*
* to not encourage wrong devicetrees, fail in case of * to not encourage wrong devicetrees, fail in case of
* an error * an error