From: daniel@ffwll.ch (Daniel Vetter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drm/pl111: Fix module probe bug
Date: Thu, 3 May 2018 15:43:12 +0200 [thread overview]
Message-ID: <20180503134312.GN12521@phenom.ffwll.local> (raw)
In-Reply-To: <20180503134053.24945-1-linus.walleij@linaro.org>
On Thu, May 03, 2018 at 03:40:53PM +0200, Linus Walleij wrote:
> 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>
> Fixes: a30933c27602 ("drm/pl111: Support the Versatile Express")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
lgtm. Please also reenable the pl111 driver in the drm-rerere branch, you
can simple revert 17c11b73c2ea6a21eaad5c1f5d358054c9e2c2f6.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/pl111/pl111_versatile.c | 7 +++++++
> drivers/gpu/drm/pl111/pl111_vexpress.c | 5 ++++-
> drivers/gpu/drm/pl111/pl111_vexpress.h | 7 +++++++
> 3 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
> index 78ddf8534fd2..2f0daab30973 100644
> --- 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 intialized 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 c9fee625faf1..508878c9bd52 100644
> --- a/drivers/gpu/drm/pl111/pl111_vexpress.c
> +++ b/drivers/gpu/drm/pl111/pl111_vexpress.c
> @@ -122,4 +122,7 @@ static struct platform_driver vexpress_muxfpga_driver = {
> .probe = vexpress_muxfpga_probe,
> };
>
> -builtin_platform_driver(vexpress_muxfpga_driver);
> +int vexpress_muxfpga_init(void)
> +{
> + return platform_driver_register(&vexpress_muxfpga_driver);
> +}
> diff --git a/drivers/gpu/drm/pl111/pl111_vexpress.h b/drivers/gpu/drm/pl111/pl111_vexpress.h
> index 49876417f7b6..40fbe42369dc 100644
> --- 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 int inline pl111_vexpress_clcd_init(struct device *dev,
> @@ -19,4 +21,9 @@ static int inline pl111_vexpress_clcd_init(struct device *dev,
> return -ENODEV;
> }
>
> +static inline int vexpress_muxfpga_init(void)
> +{
> + return 0;
> +}
> +
> #endif
> --
> 2.17.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2018-05-03 13:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-03 13:40 [PATCH] drm/pl111: Fix module probe bug Linus Walleij
2018-05-03 13:43 ` Daniel Vetter [this message]
2018-05-03 14:06 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180503134312.GN12521@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox