diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-06 22:17:33 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-23 17:53:45 -0400 |
| commit | 720873bf428db0859ebbcf6b86ed510688b4e0b8 (patch) | |
| tree | f94e2b2c6306c94cfad474827478ef1223b07d08 /drivers/video | |
| parent | 24f5aec3646f2a22d8ff8e02c07d6c9a92a5092a (diff) | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/bridge/ptn3460.c | 7 | ||||
| -rw-r--r-- | drivers/video/broadwell_igd.c | 5 | ||||
| -rw-r--r-- | drivers/video/exynos/exynos_dp_lowlevel.c | 6 | ||||
| -rw-r--r-- | drivers/video/tegra124/display.c | 8 | ||||
| -rw-r--r-- | drivers/video/vidconsole-uclass.c | 6 |
5 files changed, 5 insertions, 27 deletions
diff --git a/drivers/video/bridge/ptn3460.c b/drivers/video/bridge/ptn3460.c index 2e2ae7c5a6..f9d3720c8f 100644 --- a/drivers/video/bridge/ptn3460.c +++ b/drivers/video/bridge/ptn3460.c @@ -11,14 +11,9 @@ static int ptn3460_attach(struct udevice *dev) { - int ret; - 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 = { diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index ce4f296d0a..4286fd0648 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -323,10 +323,7 @@ err: static unsigned long gtt_read(struct broadwell_igd_priv *priv, unsigned long reg) { - u32 val; - - val = readl(priv->regs + reg); - return val; + return readl(priv->regs + reg); } static void gtt_write(struct broadwell_igd_priv *priv, unsigned long reg, diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c index f9784738bb..aae78a8159 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.c +++ b/drivers/video/exynos/exynos_dp_lowlevel.c @@ -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 reg; - - reg = readl(&dp_regs->lane_count_set); - - return reg; + return readl(&dp_regs->lane_count_set); } unsigned char exynos_dp_get_lanex_pre_emphasis(struct exynos_dp *dp_regs, diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index 2f1f0df20e..d8999c3c68 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -326,13 +326,7 @@ static int display_update_config_from_edid(struct udevice *dp_dev, int *panel_bppp, struct display_timing *timing) { - int ret; - - ret = display_read_timing(dp_dev, timing); - if (ret) - return ret; - - return 0; + return display_read_timing(dp_dev, timing); } static int display_init(struct udevice *dev, void *lcdbase, diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index c8cc05e3c2..e9a90b1b9b 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -190,7 +190,6 @@ static int vidconsole_post_probe(struct udevice *dev) { struct vidconsole_priv *priv = dev_get_uclass_priv(dev); struct stdio_dev *sdev = &priv->sdev; - int ret; if (!priv->tab_width_frac) priv->tab_width_frac = VID_TO_POS(priv->x_charsize) * 8; @@ -206,11 +205,8 @@ static int vidconsole_post_probe(struct udevice *dev) sdev->putc = vidconsole_putc; sdev->puts = vidconsole_puts; sdev->priv = dev; - ret = stdio_register(sdev); - if (ret) - return ret; - return 0; + return stdio_register(sdev); } UCLASS_DRIVER(vidconsole) = { |