diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-05-24 17:49:58 +0200 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2017-05-31 10:50:36 -0700 |
commit | 66d6dd45eee2893f249a13406e112a35cc86c987 (patch) | |
tree | f1a942fa6a06043244206a64abe86c95c7c28b7c /drivers/gpu/drm/pl111/pl111_drv.c | |
parent | 91110a4b64fe0bdbac084b79dbd5f10c458327e9 (diff) | |
download | op-kernel-dev-66d6dd45eee2893f249a13406e112a35cc86c987.zip op-kernel-dev-66d6dd45eee2893f249a13406e112a35cc86c987.tar.gz |
drm/pl111: fix warnings without CONFIG_ARM_AMBA
The driver is written in a way to enable compile-testing without CONFIG_ARM_AMBA,
but it just causes needless warnings:
drivers/gpu/drm/pl111/pl111_drv.c:149:26: error: 'pl111_drm_driver' defined but not used [-Werror=unused-variable]
drivers/gpu/drm/pl111/pl111_drv.c:81:12: error: 'pl111_modeset_init' defined but not used [-Werror=unused-function]
This unhides the probe/remove functions again and just leaves the driver
object as unused when CONFIG_ARM_AMBA is disabled, with a __maybe_unused
annotation to shut up the warning.
Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524155020.1777369-1-arnd@arndb.de
Diffstat (limited to 'drivers/gpu/drm/pl111/pl111_drv.c')
-rw-r--r-- | drivers/gpu/drm/pl111/pl111_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index e96efad..ac8771b 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -179,7 +179,6 @@ static struct drm_driver pl111_drm_driver = { #endif }; -#ifdef CONFIG_ARM_AMBA static int pl111_amba_probe(struct amba_device *amba_dev, const struct amba_id *id) { @@ -252,7 +251,7 @@ static struct amba_id pl111_id_table[] = { {0, 0}, }; -static struct amba_driver pl111_amba_driver = { +static struct amba_driver pl111_amba_driver __maybe_unused = { .drv = { .name = "drm-clcd-pl111", }, @@ -261,8 +260,9 @@ static struct amba_driver pl111_amba_driver = { .id_table = pl111_id_table, }; +#ifdef CONFIG_ARM_AMBA module_amba_driver(pl111_amba_driver); -#endif /* CONFIG_ARM_AMBA */ +#endif MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR("ARM Ltd."); |