From patchwork Wed Jan 13 08:07:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 362061 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp297097jap; Wed, 13 Jan 2021 00:08:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjwXjliT5bbTzP4+g1c0p17Gtro47dlYTkKtr6eDpSpQElrusfopG4Y5wfoRehJomRGeyl X-Received: by 2002:a17:902:bc41:b029:de:1ec2:dac1 with SMTP id t1-20020a170902bc41b02900de1ec2dac1mr982332plz.9.1610525327501; Wed, 13 Jan 2021 00:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610525327; cv=none; d=google.com; s=arc-20160816; b=PBmjB1MzvqndmFbrxbof3/UXSZg6wnrEBbDLz7UaaTcQjszCAPfwgf493nn8cYeoq+ l5IyqpL6pq+AJybIQa4NSW4tPU1y0xhEOfdMv1zPPJvQH8BfRfuYBb9RGdMGUSpt862x 6nFZ7CQIhBzqowwQiF0NZrRTFESQ3dWguETyW3WZu4clhZLihzuMWXyWvlEyohM18g+V ObdMNtHzKyGuGuT+knjq40TgCqffh7QY+yaejbkYR1k744CTJSWfbupI1QY54c72c151 HXcXoy3KWjDUV20GieU2JCJnIU60zTDF9rPfZcVvqf3t+42Gp1jYQfmW3x3JLu9DkpV7 DQRA== 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=ASGeeeOw8e3KzoNgZDiVvxr+Qg/dDEs+JPNRPvGEC64=; b=kCVvhNe+T4o9WYznoG8wQ85+D/CodO/53kAv7mB0yallUoCLVR1nXIvv3AN5MWQV3E +mymAru/89dEiXbH0WaZNh/s/egPqoUfyQiSnNIsRhcjMusYZJjMhmKiN9nZPqXv/Pgh XdE8yFPcsL2A+NeTyw+MJsyigW2QOcbtvU6I8QjzUbg8/Nos0vrHMqq4y2j5n4Zj8dQJ /2RitkubR8k2xV1WCEYWJqoPI2RBi0/e1ogMVXjfLP+6pRs5rMb9jkiqCOmLalnjRKpD VQQVFktmrw6tuKkenQeLRCboD3mUYeLy5vCKA+rGxxldBVjlUWMihbTOreFJBxkKBJBH rQ/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fK1nyW2A; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id m17si1501552pjr.170.2021.01.13.00.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 00:08:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fK1nyW2A; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 A13C86E0AF; Wed, 13 Jan 2021 08:08:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by gabe.freedesktop.org (Postfix) with ESMTPS id E16566E07D for ; Wed, 13 Jan 2021 08:08:32 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id c5so1067619wrp.6 for ; Wed, 13 Jan 2021 00:08:32 -0800 (PST) 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=1qkAO/aGHo5CcrKre6xluwg8dEdIWKSiyZUvz4qO5fI=; b=fK1nyW2AuJAUc4P3U08Io3K5pslY3Qe+t7ZLNtrnVRB0J22NU2/CdxFP096XibmbmF TPgZ014z9pkUJeqBZgCb+LqDnEj1wZTKn1K9vsS8BP2fRvu8MqEADkgJC4iSAVRExKvH TFVcuQId+YR1/mySwfbskaUpIhXx5/dFTrDmiJpp7n2rpSnm+qhsWDAWEzZyiCmweMeU 9CU49nydxJsRPbqrX5Fma0dooI88HQ/C5U6sM6XS3myuJla2FvTJxSYFijuSF4lPBFeO sK747r7kYb2EQ6Cj1yhQK99qglrQNrSY/svRrKZuJPG4KgceTPFb/EO2bpA2wMtsOfTY lDuw== 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=1qkAO/aGHo5CcrKre6xluwg8dEdIWKSiyZUvz4qO5fI=; b=I1kgqEZ4JwY/42ENw1cpqslD4kcCdiG5OM1NEHJHkx5hJxa9p6IBOogFfnIBmSACo/ 1xcJd6MiIrIHsVzTnd7PUs8xHz//4mhV69hEy+aCaVtjWOUGOOnu9IPcWJ1lBLk8r4p+ I7zIyAZIKY1riuorD79HL+5rUhKwzRJ30Qm1MYj/C1encHNxTCqoATmYORwrM2Ed9w6n Hj4czRaDHF5h3eRBbTADAQBzeVN27p/s2T6jFKYU4dPi6mSjKCXMCNpD5jU0+Sf3qihV xFMe8Tw/J0cZz/qhEt43c+4rH+8v6NCXhTwq3f/tnzaRJogQVYS7EFlMd78IUd4ETpyS UWCg== X-Gm-Message-State: AOAM5325yPvOMGMyfPtP+R6Rh7rAQAeRFsG8foJ9RM1t6O7Nb/8Tnwf0 sJ9I/1IAlXwNwiJ+igqeLjhMog== X-Received: by 2002:a5d:4905:: with SMTP id x5mr1179688wrq.75.1610525311521; Wed, 13 Jan 2021 00:08:31 -0800 (PST) Received: from dell.default ([91.110.221.229]) by smtp.gmail.com with ESMTPSA id r20sm1642486wmh.15.2021.01.13.00.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 00:08:30 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [PATCH 29/30] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions Date: Wed, 13 Jan 2021 08:07:51 +0000 Message-Id: <20210113080752.1003793-30-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113080752.1003793-1-lee.jones@linaro.org> References: <20210113080752.1003793-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 --- 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__ */