From patchwork Wed May 24 15:49:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100446 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp341817qge; Wed, 24 May 2017 08:50:41 -0700 (PDT) X-Received: by 10.99.125.67 with SMTP id m3mr39652821pgn.153.1495641041862; Wed, 24 May 2017 08:50:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495641041; cv=none; d=google.com; s=arc-20160816; b=IfiQBTtLgOs7X235dVDv24+hFAq/C08p844OLZ1RxLM1yZ7McdxzGEx5WkWz8VLXrU FDoasVrXEgoExw+hBa7hDjEpl47liBi6XJ8KyiRdMwsY3EXLItMM1g3YehYjoK8Y5yeW XuYRWGdSnJrK44z8CbPVJlCg4eoTPeXuU8YjNwnySJbA2ID+x2id3X2I52DCMxAy9nNW LpvprZ01ZsQkZh4clV5l7AHDmENoVPFe1lgjfquOmbYYvNANYi3kkACVSxDns3qQyRlz 0YftZAtYYkzQxQrnx/xduUNsyEe3mHAMz5c2QvdrlG7Rv70lWSeQrydIsEG9WFGRnTN/ WSDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=wDir3OxRHiY455R+u6efwofAz0tlQCSap85jRTUkU5w=; b=EnsbOLAv47sf65vd2pZuEhmeYbCtN5B1wr49ZNg9O8Ox+Hsinalql9RuU2Jl1iVl8l kKUQHaBbTPTnkFmlsk7gs6GLeuot0pI0+aBLR+0PnJCg6ZFeXNn89pdIFPuiSJPlz0k7 VlxFPeFUGgKuCd0Y3WMlUhc5JBEt7PJyT9u4PgVPz0ARFIKZBwgCvVdd28Msf3wshOMe FDV2l7ly6pZSOwD/kwyQ2OwU/+wQimU/bBqKGw+VSkDsPW3xS6mRbgqVCPkVAuyRehmA /WvjyJMEs2bJ8jdFu+OiCoEMPi1ZVNr7UGJvrFooXxkTqvmeA3cnueVNKfCAgmqijxDq wMxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q72si25188979pfl.405.2017.05.24.08.50.41; Wed, 24 May 2017 08:50:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764521AbdEXPud (ORCPT + 25 others); 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 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LdVtC-1deKVx232g-00iiEU; Wed, 24 May 2017 17:50:23 +0200 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 Precedence: bulk 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(-) -- 2.9.0 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.");