Skip to content
Snippets Groups Projects
Commit 720873bf authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini
Browse files

video: squash lines for immediate return


For vidconsole_post_probe(), it is common coding style to let a
probe method return the value of a register function.

The others will become simple wrapper functions.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarAnatolij Gustschin <agust@denx.de>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
parent 24f5aec3
No related branches found
No related tags found
No related merge requests found
...@@ -11,14 +11,9 @@ ...@@ -11,14 +11,9 @@
static int ptn3460_attach(struct udevice *dev) static int ptn3460_attach(struct udevice *dev)
{ {
int ret;
debug("%s: %s\n", __func__, dev->name); debug("%s: %s\n", __func__, dev->name);
ret = video_bridge_set_active(dev, true);
if (ret)
return ret;
return 0; return video_bridge_set_active(dev, true);
} }
struct video_bridge_ops ptn3460_ops = { struct video_bridge_ops ptn3460_ops = {
......
...@@ -323,10 +323,7 @@ err: ...@@ -323,10 +323,7 @@ err:
static unsigned long gtt_read(struct broadwell_igd_priv *priv, static unsigned long gtt_read(struct broadwell_igd_priv *priv,
unsigned long reg) unsigned long reg)
{ {
u32 val; return readl(priv->regs + reg);
val = readl(priv->regs + reg);
return val;
} }
static void gtt_write(struct broadwell_igd_priv *priv, unsigned long reg, static void gtt_write(struct broadwell_igd_priv *priv, unsigned long reg,
......
...@@ -881,11 +881,7 @@ void exynos_dp_set_lane_count(struct exynos_dp *dp_regs, unsigned char count) ...@@ -881,11 +881,7 @@ void exynos_dp_set_lane_count(struct exynos_dp *dp_regs, unsigned char count)
unsigned int exynos_dp_get_lane_count(struct exynos_dp *dp_regs) unsigned int exynos_dp_get_lane_count(struct exynos_dp *dp_regs)
{ {
unsigned int reg; return readl(&dp_regs->lane_count_set);
reg = readl(&dp_regs->lane_count_set);
return reg;
} }
unsigned char exynos_dp_get_lanex_pre_emphasis(struct exynos_dp *dp_regs, unsigned char exynos_dp_get_lanex_pre_emphasis(struct exynos_dp *dp_regs,
......
...@@ -326,13 +326,7 @@ static int display_update_config_from_edid(struct udevice *dp_dev, ...@@ -326,13 +326,7 @@ static int display_update_config_from_edid(struct udevice *dp_dev,
int *panel_bppp, int *panel_bppp,
struct display_timing *timing) struct display_timing *timing)
{ {
int ret; return display_read_timing(dp_dev, timing);
ret = display_read_timing(dp_dev, timing);
if (ret)
return ret;
return 0;
} }
static int display_init(struct udevice *dev, void *lcdbase, static int display_init(struct udevice *dev, void *lcdbase,
......
...@@ -190,7 +190,6 @@ static int vidconsole_post_probe(struct udevice *dev) ...@@ -190,7 +190,6 @@ static int vidconsole_post_probe(struct udevice *dev)
{ {
struct vidconsole_priv *priv = dev_get_uclass_priv(dev); struct vidconsole_priv *priv = dev_get_uclass_priv(dev);
struct stdio_dev *sdev = &priv->sdev; struct stdio_dev *sdev = &priv->sdev;
int ret;
if (!priv->tab_width_frac) if (!priv->tab_width_frac)
priv->tab_width_frac = VID_TO_POS(priv->x_charsize) * 8; priv->tab_width_frac = VID_TO_POS(priv->x_charsize) * 8;
...@@ -206,11 +205,8 @@ static int vidconsole_post_probe(struct udevice *dev) ...@@ -206,11 +205,8 @@ static int vidconsole_post_probe(struct udevice *dev)
sdev->putc = vidconsole_putc; sdev->putc = vidconsole_putc;
sdev->puts = vidconsole_puts; sdev->puts = vidconsole_puts;
sdev->priv = dev; sdev->priv = dev;
ret = stdio_register(sdev);
if (ret)
return ret;
return 0; return stdio_register(sdev);
} }
UCLASS_DRIVER(vidconsole) = { UCLASS_DRIVER(vidconsole) = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment