From patchwork Fri Apr 16 14:36:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 422515 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp447667jaf; Fri, 16 Apr 2021 07:38:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBdvKYKNRjDrz1EjW11eS+A+KMh4KzOQdYwEeLC0N9QuAmAhebhp0dYnLej2HwT24YzFA0 X-Received: by 2002:a17:90a:db15:: with SMTP id g21mr9848317pjv.113.1618583887642; Fri, 16 Apr 2021 07:38:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618583887; cv=none; d=google.com; s=arc-20160816; b=y1i/lUpXglQzVUg93fIvbWbmrsobO3sKGyD2I5nNLJZ1mt6thLoGD41n7x3r27ZsRe Z1JUWb7tN8lqXK1Wp5oUSVcvwsZrjehSiqPEgyiRN/oA40vdW6lKU2NnGtaPfyRcospi 13I92/JPSUlm4hqb3mI7ZsWLsBEFNnOOin/PGTlZL6t1kh/dmt2RTbzsZjiDjkJHNJWt xjJjOFQHN9OR7POz+yiXFo6bzck30WEPFbCG2LVQaLJp2hhZ/X7IpiMF4BaBYWgFnsH7 XEhiV6dNjzkr52eorhXN0g4LllOya2OM3PpVJOElMwQZFQ6FnPGTdGlGEp28F/W2CdND BY9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=y8jOaxtElLQfRw0/wyZGdQJBRPprlkf1XzdhEe6Q4As=; b=KSCOnpCl8oAacHOyd54TJEjxQPuNFuJiLmlV33DjjYG3gg0iuIZqTWOR+/Dca5aJ/5 295iOtnuQZXyfxC0FY8uAEk9TfDUgK59P9kyhMiLjYrNo6DoGNBNrL613fjb+zye46W7 PrYGDYzZTH+ajiyXBD35UtDSzBSF9scA26GGun2lXXOADhE7wFmL00a5ZGIZfEfaPHG3 isLEkcX+wFk+sAcmVzsI7XDo4WhOn+H0LMbvybnkm6vEF8a5SyMfIPy7T56qjCwWTtC6 9SmbV4b1GeELTG1zRQVD1jxQ7J3MMhxV5hxp7mlHE+ZfDJ4HR/+x/N2H/GtFyPUDm920 EV6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vIYbLsCn; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id m10si6553274pfc.259.2021.04.16.07.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:38:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=vIYbLsCn; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB97B6EC15; Fri, 16 Apr 2021 14:37:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBC656EC08 for ; Fri, 16 Apr 2021 14:37:44 +0000 (UTC) Received: by mail-ed1-x531.google.com with SMTP id m3so32536340edv.5 for ; Fri, 16 Apr 2021 07:37:44 -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=vIYbLsCnXZcnG2cRVSblNfFcyusCLsjiUbckjgZLHrJu6wDwi1lkqsJDWjwnKopAbu op3YKHikZtzbx4ebcA//omZ7wElXRbE3SIzbxL7lHvJfJz9VvqtD8XnemiSCAyA8Kwnp k5hBgFXoTYJ+0Bmaeztgy7ain6htlqbELXe8o/1/xm2P/RJeL+z+SPFh0r40bmb6emob VekFGRhmY26RK5HqiqPScD2iCiATVkSt/PR2mBWrYuYRmZom+0wbf9wfUICQXaonjPQc UsuTfOaixW7nlp/DpWhgEkkXSwA0gDFdxm1f31eD/B27hticKj+ixocIwwQ2cOScMtd1 iqJw== 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=b1SdL1VNRQhattceP3q5kHgXfIT72Box71Yeqy+edjc3s+Od4GWPYWDJDBIUSs/AYw tgIBH5D47jCMGqzA/2SXxD6k6wf6p9YRW2HC3A8uGT1uCmgInPPtn6PVRft/1QVaHJ/H pmZY/Sxq7EHlTkNpNZDmLa21Ot2yHcfUt4mWMQ+hfQb+vc9FVwcwcUaP3Ly3eFjsH2g8 uqYONFXbdVNEMmXE2k3mYT6yvAjQMyZrRpzVtOfa79AtskJBJm8kXG2Ch/UQ+21d5gHS O2uSLcJBhQRi8Edl9oVCmDxz8X56ifHEJDbpo4OBXtvkifzRvrs4PHfaEzmX+CNl4BZp o0bA== X-Gm-Message-State: AOAM530qlxH+5YFaTkydH6eQlIRv4UTrmoSjXg/d8ui9P2jbhaJS5A4k yrIcc9KGvq+2Dd0DDEeHJ1fSwg== X-Received: by 2002:a05:6402:35cd:: with SMTP id z13mr10413409edc.21.1618583863370; Fri, 16 Apr 2021 07:37:43 -0700 (PDT) Received: from dell.default ([91.110.221.215]) by smtp.gmail.com with ESMTPSA id j10sm1326523ejk.93.2021.04.16.07.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 07:37:42 -0700 (PDT) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 12/40] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions Date: Fri, 16 Apr 2021 15:36:57 +0100 Message-Id: <20210416143725.2769053-13-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416143725.2769053-1-lee.jones@linaro.org> References: <20210416143725.2769053-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__ */