From patchwork Fri Mar 19 08:24:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12150355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06301C433E0 for ; Fri, 19 Mar 2021 08:24:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C070364F6D for ; Fri, 19 Mar 2021 08:24:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C070364F6D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EF136E99F; Fri, 19 Mar 2021 08:24:50 +0000 (UTC) Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07CA06E99F for ; Fri, 19 Mar 2021 08:24:48 +0000 (UTC) Received: by mail-ej1-x635.google.com with SMTP id r12so8275321ejr.5 for ; Fri, 19 Mar 2021 01:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lgIHEbwNozF8CQjai0jy8D0j5kT9wSfHdAr6OHIEyt8=; b=jFlylHIdiRjWW3YT3NJyatX6kumdMHVDL4w5muuu5ZNZkb2snt4y8ikCg0ranm6Ww8 m96+ml0edqRsT4qgjrvCK1wmR2oixp86VlSHuHMKFeI7SwKtaHNkwIpQJGuwmFOBMvib 8BnfX1G10yRT43gJCTd8AhCTP4I6RFuLd6Zp2FMpE0BRqb/AK6Zyb8wRvI9rSkXF8I5f XKXTj2wMGcieuKJSobaGIG2ybJpcCKSDTFqiahHaf4SOLV5wbFRZNMANF9OdrAHwTxfd +UzINV1MUayN9Bm9eBacrVY1zmu+7E+XNGBZY688dw0TJZxcrg7wwbkYDcuC1+rQr82C AGkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lgIHEbwNozF8CQjai0jy8D0j5kT9wSfHdAr6OHIEyt8=; b=hbJtBZRIZAE1CeVDg7VIYfm6VGbG+DrpMMb9Toyt8llqMMXKTKkBoYZX3O3MSyTneg YvxLdfIU+GnSo6iBKnRt6yr98SyAarpdFuaJQN0awUQsX3xd9PI14IzddH+s6E098+da kGflbuOMeujcncbLvqykrQZvwCX/gFSzRuR3S4qLFkjgPx86vIbZQQxCWON1arEl4gZq ip/sr7JDPvtrdpmEkESUxMl9pbet+uPgAGGqkC3FDCKm23bnfb49tLf9APeNRtkEnRWq pzOVWQpUX/4xk5N6llWJ5Gc5Hr95Z0MqeCxyLJEIYu1VTF9ojdQA8mjdyJ1EccBcXTtc 01gg== X-Gm-Message-State: AOAM530+sfDNyPKiXqueNIb0r0iJQ1hOclVDQw5cWVuq/cmU1DOe48le KVhijbwX5Qm5kJhP2UIq6ruT7g== X-Google-Smtp-Source: ABdhPJyVuWB7o4CF5wAL/W6n7Ok9f0Tc0wd4Z4nANrbihKHz6pBJkEP20GSW1Lukf9i/YMR6XsDz9w== X-Received: by 2002:a17:906:73c2:: with SMTP id n2mr3009679ejl.224.1616142286710; Fri, 19 Mar 2021 01:24:46 -0700 (PDT) Received: from dell.default ([91.110.221.194]) by smtp.gmail.com with ESMTPSA id b18sm3273727ejb.77.2021.03.19.01.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 01:24:46 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 15/19] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions Date: Fri, 19 Mar 2021 08:24:24 +0000 Message-Id: <20210319082428.3294591-16-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319082428.3294591-1-lee.jones@linaro.org> References: <20210319082428.3294591-1-lee.jones@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fixes the following build error: drivers/gpu/drm/nouveau/dispnv50/disp.c:2530:1: error: conflicting types for ‘nv50_display_fini’ In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:36:6: note: previous declaration of ‘nv50_display_fini’ was her In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:35:6: note: previous declaration of ‘nv50_display_init’ was here drivers/gpu/drm/nouveau/dispnv50/disp.c:2581:1: error: static declaration of ‘nv50_display_destroy’ follows non-static declaration In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:34:6: note: previous declaration of ‘nv50_display_destroy’ was here Cc: Ben Skeggs Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Signed-off-by: Lee Jones Reviewed-by: Karol Herbst --- drivers/gpu/drm/nouveau/nv50_display.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h index fbd3b15583bc8..2421401d12636 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.h +++ b/drivers/gpu/drm/nouveau/nv50_display.h @@ -31,7 +31,4 @@ #include "nouveau_reg.h" int nv50_display_create(struct drm_device *); -void nv50_display_destroy(struct drm_device *); -int nv50_display_init(struct drm_device *); -void nv50_display_fini(struct drm_device *); #endif /* __NV50_DISPLAY_H__ */