From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764517AbdEXPud (ORCPT ); Wed, 24 May 2017 11:50:33 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:64351 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751170AbdEXPuc (ORCPT ); Wed, 24 May 2017 11:50:32 -0400 From: Arnd Bergmann To: Eric Anholt , David Airlie Cc: Arnd Bergmann , Linus Walleij , Daniel Vetter , linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/pl111: fix warnings without CONFIG_ARM_AMBA Date: Wed, 24 May 2017 17:49:58 +0200 Message-Id: <20170524155020.1777369-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:JO5o08NFGv47kVQwGYJk0ffYQiOTsw+shIJsDkjmaknZCoz7oS8 2v3IUc42BhUNJJ7uILKtnbzX5lWXhrHCrtKbFMegPVFZ9z3hYmM5AC4+ytoqJGqK/gbrY2d wnRk+5ympFrpr6VChKEsLgVZGqk5aqjNp8bd3NlUhh7enLDVG+eZRRvEdYdKLrEK6o44lvp fsjcMBKmFp1LgLuopeGdg== X-UI-Out-Filterresults: notjunk:1;V01:K0:2vZT3OKwpF4=:4JpOpFWcfxDjwaDvK9Czpt JpW4oXQrRiBNA2KQL6xIG+h4jXcEeE/ng/Z+Sig5jCTaYpC5rzhq36lU3L5Y5LXq4g094ruuM fTs4WoqYzeQFeaOs59NYwAcu1Iwzadd4XYzpx6eDruV91CxsPGsUzF90NlE+p45saVQHaFVTb 5Bs+7AQdzxmx/1YhgjFyIyc1tkDB4AKvfNxow2/+K3O5tQVKjVSjrGFoiKFaDwKkQvL5anOcD tQxmn91mYuvIu8qDBSJu1Gb93kOw7cJsbzlm0tEc0SsYCuZtm9v0NcCXHhfl2ksn0XYnGJstu G0znqkUmCaWXeZ4eMQugUIU1qJMg7Wnw6z348jFqrIHNzZ4O0aoOrUByx5giSaaTfR2j6UWgO qrsdpjkyeQ1w9juP1cvjDFJp62RPPPveYxnUC/4gafdGsFX3MtfNXDYGxmU3q8EUxDoLbAunM oXDrPu4XAS+BBPrHiRlp1l5JIK5vaZzZMnAU9mC8tls267iLEs1NunOFD/JWi3oz8uWi4n7vl nKFm16EEAqboZxd7vXvvUS5kKyJhSlArWGP1rhaIDbcZEQlEKbcLLWDN7vZk9Q4M2ArOq2s6t N21nqXuQhY4uEakq83x2oNu0kzdeBjX1RdGk78T60MBOMot8pRoOZCUBAxm18TWuNDi4IU3zQ xzCXEHRWb+xYK7c7wrUfdMWnqxv2MsF5z/vImoNYP9yaG/1NbLWJYCfu/m7WtCh+pke8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/gpu/drm/pl111/pl111_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 97095b1aa961..daa22849aeed 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."); -- 2.9.0