Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Yangtao Li
and committed by
Helge Deller
53a90ae8
78dd4f41
+9
-14
+9
-14
drivers/video/fbdev/imxfb.c
+9
-14
drivers/video/fbdev/imxfb.c
···
903
903
if (!display_np) {
904
904
dev_err(&pdev->dev, "No display defined in devicetree\n");
905
905
ret = -EINVAL;
906
-
goto failed_of_parse;
906
+
goto failed_init;
907
907
}
908
908
909
909
/*
···
917
917
if (!fbi->mode) {
918
918
ret = -ENOMEM;
919
919
of_node_put(display_np);
920
-
goto failed_of_parse;
920
+
goto failed_init;
921
921
}
922
922
923
923
ret = imxfb_of_read_mode(&pdev->dev, display_np, fbi->mode);
924
924
of_node_put(display_np);
925
925
if (ret)
926
-
goto failed_of_parse;
926
+
goto failed_init;
927
927
928
928
/* Calculate maximum bytes used per pixel. In most cases this should
929
929
* be the same as m->bpp/8 */
···
936
936
fbi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
937
937
if (IS_ERR(fbi->clk_ipg)) {
938
938
ret = PTR_ERR(fbi->clk_ipg);
939
-
goto failed_getclock;
939
+
goto failed_init;
940
940
}
941
941
942
942
/*
···
951
951
*/
952
952
ret = clk_prepare_enable(fbi->clk_ipg);
953
953
if (ret)
954
-
goto failed_getclock;
954
+
goto failed_init;
955
955
clk_disable_unprepare(fbi->clk_ipg);
956
956
957
957
fbi->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
958
958
if (IS_ERR(fbi->clk_ahb)) {
959
959
ret = PTR_ERR(fbi->clk_ahb);
960
-
goto failed_getclock;
960
+
goto failed_init;
961
961
}
962
962
963
963
fbi->clk_per = devm_clk_get(&pdev->dev, "per");
964
964
if (IS_ERR(fbi->clk_per)) {
965
965
ret = PTR_ERR(fbi->clk_per);
966
-
goto failed_getclock;
966
+
goto failed_init;
967
967
}
968
968
969
969
fbi->regs = devm_platform_ioremap_resource(pdev, 0);
970
970
if (IS_ERR(fbi->regs)) {
971
971
ret = PTR_ERR(fbi->regs);
972
-
goto failed_ioremap;
972
+
goto failed_init;
973
973
}
974
974
975
975
fbi->map_size = PAGE_ALIGN(info->fix.smem_len);
···
978
978
if (!info->screen_buffer) {
979
979
dev_err(&pdev->dev, "Failed to allocate video RAM\n");
980
980
ret = -ENOMEM;
981
-
goto failed_map;
981
+
goto failed_init;
982
982
}
983
983
984
984
info->fix.smem_start = fbi->map_dma;
···
1030
1030
1031
1031
failed_lcd:
1032
1032
unregister_framebuffer(info);
1033
-
1034
1033
failed_register:
1035
1034
fb_dealloc_cmap(&info->cmap);
1036
1035
failed_cmap:
1037
1036
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
1038
1037
fbi->map_dma);
1039
-
failed_map:
1040
-
failed_ioremap:
1041
-
failed_getclock:
1042
-
failed_of_parse:
1043
1038
failed_init:
1044
1039
framebuffer_release(info);
1045
1040
return ret;