Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/pl111: Fix module probe bug

Commit a30933c27602 ("drm/pl111: Support the Versatile Express")
Added a second module using the builtin_platform_driver() call,
which works fine as long as you do not try to build the PL111
driver as a module, because a module can only have one initcall
and cause the following build bug:

(...) multiple definition of `init_module' (...)

Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: a30933c27602 ("drm/pl111: Support the Versatile Express")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180503140431.5798-1-linus.walleij@linaro.org

+24 -1
+7
drivers/gpu/drm/pl111/pl111_versatile.c
··· 326 326 if (versatile_clcd_type == VEXPRESS_CLCD_V2M) { 327 327 struct platform_device *pdev; 328 328 329 + /* Registers a driver for the muxfpga */ 330 + ret = vexpress_muxfpga_init(); 331 + if (ret) { 332 + dev_err(dev, "unable to initialize muxfpga driver\n"); 333 + return ret; 334 + } 335 + 329 336 /* Call into deep Vexpress configuration API */ 330 337 pdev = of_find_device_by_node(np); 331 338 if (!pdev) {
+10 -1
drivers/gpu/drm/pl111/pl111_vexpress.c
··· 122 122 .probe = vexpress_muxfpga_probe, 123 123 }; 124 124 125 - builtin_platform_driver(vexpress_muxfpga_driver); 125 + int vexpress_muxfpga_init(void) 126 + { 127 + int ret; 128 + 129 + ret = platform_driver_register(&vexpress_muxfpga_driver); 130 + /* -EBUSY just means this driver is already registered */ 131 + if (ret == -EBUSY) 132 + ret = 0; 133 + return ret; 134 + }
+7
drivers/gpu/drm/pl111/pl111_vexpress.h
··· 10 10 struct pl111_drm_dev_private *priv, 11 11 struct regmap *map); 12 12 13 + int vexpress_muxfpga_init(void); 14 + 13 15 #else 14 16 15 17 static inline int pl111_vexpress_clcd_init(struct device *dev, ··· 19 17 struct regmap *map) 20 18 { 21 19 return -ENODEV; 20 + } 21 + 22 + static inline int vexpress_muxfpga_init(void) 23 + { 24 + return 0; 22 25 } 23 26 24 27 #endif