Skip to content

Commit 53a90ae

Browse files
bbkzzhdeller
authored andcommitted
fbdev: imxfb: remove unneeded labels
These labels are now redundant and don't do anything, let's remove them. Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Helge Deller <deller@gmx.de>
1 parent 78dd4f4 commit 53a90ae

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

drivers/video/fbdev/imxfb.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ static int imxfb_probe(struct platform_device *pdev)
903903
if (!display_np) {
904904
dev_err(&pdev->dev, "No display defined in devicetree\n");
905905
ret = -EINVAL;
906-
goto failed_of_parse;
906+
goto failed_init;
907907
}
908908

909909
/*
@@ -917,13 +917,13 @@ static int imxfb_probe(struct platform_device *pdev)
917917
if (!fbi->mode) {
918918
ret = -ENOMEM;
919919
of_node_put(display_np);
920-
goto failed_of_parse;
920+
goto failed_init;
921921
}
922922

923923
ret = imxfb_of_read_mode(&pdev->dev, display_np, fbi->mode);
924924
of_node_put(display_np);
925925
if (ret)
926-
goto failed_of_parse;
926+
goto failed_init;
927927

928928
/* Calculate maximum bytes used per pixel. In most cases this should
929929
* be the same as m->bpp/8 */
@@ -936,7 +936,7 @@ static int imxfb_probe(struct platform_device *pdev)
936936
fbi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
937937
if (IS_ERR(fbi->clk_ipg)) {
938938
ret = PTR_ERR(fbi->clk_ipg);
939-
goto failed_getclock;
939+
goto failed_init;
940940
}
941941

942942
/*
@@ -951,25 +951,25 @@ static int imxfb_probe(struct platform_device *pdev)
951951
*/
952952
ret = clk_prepare_enable(fbi->clk_ipg);
953953
if (ret)
954-
goto failed_getclock;
954+
goto failed_init;
955955
clk_disable_unprepare(fbi->clk_ipg);
956956

957957
fbi->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
958958
if (IS_ERR(fbi->clk_ahb)) {
959959
ret = PTR_ERR(fbi->clk_ahb);
960-
goto failed_getclock;
960+
goto failed_init;
961961
}
962962

963963
fbi->clk_per = devm_clk_get(&pdev->dev, "per");
964964
if (IS_ERR(fbi->clk_per)) {
965965
ret = PTR_ERR(fbi->clk_per);
966-
goto failed_getclock;
966+
goto failed_init;
967967
}
968968

969969
fbi->regs = devm_platform_ioremap_resource(pdev, 0);
970970
if (IS_ERR(fbi->regs)) {
971971
ret = PTR_ERR(fbi->regs);
972-
goto failed_ioremap;
972+
goto failed_init;
973973
}
974974

975975
fbi->map_size = PAGE_ALIGN(info->fix.smem_len);
@@ -978,7 +978,7 @@ static int imxfb_probe(struct platform_device *pdev)
978978
if (!info->screen_buffer) {
979979
dev_err(&pdev->dev, "Failed to allocate video RAM\n");
980980
ret = -ENOMEM;
981-
goto failed_map;
981+
goto failed_init;
982982
}
983983

984984
info->fix.smem_start = fbi->map_dma;
@@ -1030,16 +1030,11 @@ static int imxfb_probe(struct platform_device *pdev)
10301030

10311031
failed_lcd:
10321032
unregister_framebuffer(info);
1033-
10341033
failed_register:
10351034
fb_dealloc_cmap(&info->cmap);
10361035
failed_cmap:
10371036
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
10381037
fbi->map_dma);
1039-
failed_map:
1040-
failed_ioremap:
1041-
failed_getclock:
1042-
failed_of_parse:
10431038
failed_init:
10441039
framebuffer_release(info);
10451040
return ret;

0 commit comments

Comments
 (0)