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

diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
index 78ddf8534fd25e4e19c5c38568e6e75b78586f74..b9baefdba38a17e5c2647075e588748ecfecf980 100644 (file)
--- a/drivers/gpu/drm/pl111/pl111_versatile.c
+++ b/drivers/gpu/drm/pl111/pl111_versatile.c
@@ -326,6 +326,13 @@ int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
        if (versatile_clcd_type == VEXPRESS_CLCD_V2M) {
                struct platform_device *pdev;
 
+               /* Registers a driver for the muxfpga */
+               ret = vexpress_muxfpga_init();
+               if (ret) {
+                       dev_err(dev, "unable to initialize muxfpga driver\n");
+                       return ret;
+               }
+
                /* Call into deep Vexpress configuration API */
                pdev = of_find_device_by_node(np);
                if (!pdev) {

diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.c b/drivers/gpu/drm/pl111/pl111_vexpress.c
index c9fee625faf1ab9aa8f1d437159a6d02de604e45..a534b225e31b33b20184dab5c72fd7d98970f9f4 100644 (file)
--- a/drivers/gpu/drm/pl111/pl111_vexpress.c
+++ b/drivers/gpu/drm/pl111/pl111_vexpress.c
@@ -122,4 +122,13 @@ static struct platform_driver vexpress_muxfpga_driver = {
        .probe = vexpress_muxfpga_probe,
 };
 
-builtin_platform_driver(vexpress_muxfpga_driver);
+int vexpress_muxfpga_init(void)
+{
+       int ret;
+
+       ret = platform_driver_register(&vexpress_muxfpga_driver);
+       /* -EBUSY just means this driver is already registered */
+       if (ret == -EBUSY)
+               ret = 0;
+       return ret;
+}

diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.h b/drivers/gpu/drm/pl111/pl111_vexpress.h
index bb54864ca91eead810a87c0f286db2d127c54973..5d3681bb4c002395dc5ee8c5736099fe97824536 100644 (file)
--- a/drivers/gpu/drm/pl111/pl111_vexpress.h
+++ b/drivers/gpu/drm/pl111/pl111_vexpress.h
@@ -10,6 +10,8 @@ int pl111_vexpress_clcd_init(struct device *dev,
                             struct pl111_drm_dev_private *priv,
                             struct regmap *map);
 
+int vexpress_muxfpga_init(void);
+
 #else
 
 static inline int pl111_vexpress_clcd_init(struct device *dev,
@@ -19,4 +21,9 @@ static inline int pl111_vexpress_clcd_init(struct device *dev,
        return -ENODEV;
 }
 
+static inline int vexpress_muxfpga_init(void)
+{
+       return 0;
+}
+
 #endif