| Message ID | 23b2cf6c-7b69-9ade-d97a-18af0c6eb73f@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/02/18 23:24, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Tue, 6 Feb 2018 22:10:11 +0100 > > Add a jump target so that a bit of exception handling can be better reused > at the end of this function. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Well, it is couple of lines less. If I would just have couple weeks time to implement proper drm panel support for tilcdc and get rid of this driver all together... Picked for the next tilcdc pullrequest. Thanks, Jyri > --- > drivers/gpu/drm/tilcdc/tilcdc_panel.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c > index 0b6aa95aec89..cf9ca16fee81 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c > @@ -289,10 +289,8 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np) > } > > info = kzalloc(sizeof(*info), GFP_KERNEL); > - if (!info) { > - of_node_put(info_np); > - return NULL; > - } > + if (!info) > + goto put_node; > > ret |= of_property_read_u32(info_np, "ac-bias", &info->ac_bias); > ret |= of_property_read_u32(info_np, "ac-bias-intrpt", &info->ac_bias_intrpt); > @@ -311,11 +309,11 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np) > if (ret) { > pr_err("%s: error reading panel-info properties\n", __func__); > kfree(info); > - of_node_put(info_np); > - return NULL; > + info = NULL; > } > - of_node_put(info_np); > > +put_node: > + of_node_put(info_np); > return info; > } > >
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c index 0b6aa95aec89..cf9ca16fee81 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c @@ -289,10 +289,8 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np) } info = kzalloc(sizeof(*info), GFP_KERNEL); - if (!info) { - of_node_put(info_np); - return NULL; - } + if (!info) + goto put_node; ret |= of_property_read_u32(info_np, "ac-bias", &info->ac_bias); ret |= of_property_read_u32(info_np, "ac-bias-intrpt", &info->ac_bias_intrpt); @@ -311,11 +309,11 @@ static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np) if (ret) { pr_err("%s: error reading panel-info properties\n", __func__); kfree(info); - of_node_put(info_np); - return NULL; + info = NULL; } - of_node_put(info_np); +put_node: + of_node_put(info_np); return info; }