From: Lee Jones <lee.jones@linaro.org> To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.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 [thread overview] Message-ID: <20210113080752.1003793-30-lee.jones@linaro.org> (raw) In-Reply-To: <20210113080752.1003793-1-lee.jones@linaro.org> 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 <bskeggs@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- 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__ */ -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Lee Jones <lee.jones@linaro.org> To: lee.jones@linaro.org Cc: David Airlie <airlied@linux.ie>, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs <bskeggs@redhat.com> Subject: [PATCH 29/30] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions Date: Wed, 13 Jan 2021 08:07:51 +0000 [thread overview] Message-ID: <20210113080752.1003793-30-lee.jones@linaro.org> (raw) In-Reply-To: <20210113080752.1003793-1-lee.jones@linaro.org> 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 <bskeggs@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- 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__ */ -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-13 8:10 UTC|newest] Thread overview: 154+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-13 8:07 [PATCH 00/30] [Set 13] Finally rid W=1 warnings from GPU Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 01/30] drm/amd/display/dc/dc_helper: Include our own header, containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:01 ` Alex Deucher 2021-01-14 17:01 ` Alex Deucher 2021-01-14 17:01 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 02/30] drm/amd/include/renoir_ip_offset: Mark top-level IP_BASE as __maybe_unused Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:03 ` Alex Deucher 2021-01-14 17:03 ` Alex Deucher 2021-01-14 17:03 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 03/30] drm/amd/display/dmub/src/dmub_dcn30: Include our own header containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:04 ` Alex Deucher 2021-01-14 17:04 ` Alex Deucher 2021-01-14 17:04 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 04/30] drm/amd/display/modules/power/power_helpers: Staticify local functions Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:05 ` Alex Deucher 2021-01-14 17:05 ` Alex Deucher 2021-01-14 17:05 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 05/30] drm/amd/display/modules/info_packet/info_packet: Correct kernel-doc formatting Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:06 ` Alex Deucher 2021-01-14 17:06 ` Alex Deucher 2021-01-14 17:06 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 06/30] drm/amd/display/dc/core/dc_resource: Staticify local functions Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:07 ` Alex Deucher 2021-01-14 17:07 ` Alex Deucher 2021-01-14 17:07 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 07/30] drm/amd/display/dc/core/dc_link: Remove unused variable 'status' Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:08 ` Alex Deucher 2021-01-14 17:08 ` Alex Deucher 2021-01-14 17:08 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 08/30] drm/amd/display/dc/core/dc_link_dp: Staticify local function 'linkRateInKHzToLinkRateMultiplier' Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:09 ` Alex Deucher 2021-01-14 17:09 ` Alex Deucher 2021-01-14 17:09 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 09/30] drm/amd/display/dc/dce112/dce112_resource: Include our own header file containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:10 ` Alex Deucher 2021-01-14 17:10 ` Alex Deucher 2021-01-14 17:10 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 10/30] drm/amd/display/dc/core/dc: Staticise local function 'apply_ctx_interdependent_lock' Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:11 ` Alex Deucher 2021-01-14 17:11 ` Alex Deucher 2021-01-14 17:11 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 11/30] drm/amd/display/dc/dce100/Makefile: Ignore -Woverride-init warning Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:11 ` Alex Deucher 2021-01-14 17:11 ` Alex Deucher 2021-01-14 17:11 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 12/30] drm/amd/display/dc/dce100/dce100_resource: Include our own header containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:12 ` Alex Deucher 2021-01-14 17:12 ` Alex Deucher 2021-01-14 17:12 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 13/30] drm/amd/display/dc/dce60/Makefile: Ignore -Woverride-init warning Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:13 ` Alex Deucher 2021-01-14 17:13 ` Alex Deucher 2021-01-14 17:13 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 14/30] drm/amd/display/dc/dce80/Makefile: " Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:14 ` Alex Deucher 2021-01-14 17:14 ` Alex Deucher 2021-01-14 17:14 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 15/30] drm/amd/display/dc/dce80/dce80_resource: Include our own header containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:14 ` Alex Deucher 2021-01-14 17:14 ` Alex Deucher 2021-01-14 17:14 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 16/30] fixup! drm/amd/display/dc/dce60/Makefile: Ignore -Woverride-init warning Lee Jones 2021-01-13 8:07 ` [PATCH 17/30] drm/amd/display/dc/dce60/dce60_resource: Include our own header containing prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:15 ` Alex Deucher 2021-01-14 17:15 ` Alex Deucher 2021-01-14 17:15 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 18/30] drm/amd/display/dc/core/dc_link: Move some local data from the stack to the heap Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:17 ` Alex Deucher 2021-01-14 17:17 ` Alex Deucher 2021-01-14 17:17 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 19/30] drm/amd/display/dc/core/dc_link_dp: Mark 'result_write_min_hblank' as __maybe_unused Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:21 ` Alex Deucher 2021-01-14 17:21 ` Alex Deucher 2021-01-14 17:21 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 20/30] drm/amd/display/dc/core/dc: Fix a bunch of documentation misdemeanours Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:22 ` Alex Deucher 2021-01-14 17:22 ` Alex Deucher 2021-01-14 17:22 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 21/30] drm/amd/display/dc/core/dc_resource: Demote some kernel-doc abuses Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:22 ` Alex Deucher 2021-01-14 17:22 ` Alex Deucher 2021-01-14 17:22 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 22/30] drm/amd/display/dc/core/dc_link: Fix a couple of function documentation issues Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 17:23 ` Alex Deucher 2021-01-14 17:23 ` Alex Deucher 2021-01-14 17:23 ` Alex Deucher 2021-01-13 8:07 ` [PATCH 23/30] drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc header Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 24/30] drm/nouveau/nouveau_bo: Remove unused variables 'dev' Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 25/30] drm/nouveau/nouveau_display: Remove set but unused variable 'width' Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 26/30] drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 27/30] drm/nouveau/dispnv50/disp: Remove unused variable 'ret' from function returning void Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 8:07 ` [PATCH 28/30] drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-13 18:48 ` Lyude Paul 2021-01-13 18:48 ` Lyude Paul 2021-01-13 18:48 ` Lyude Paul 2021-01-13 8:07 ` Lee Jones [this message] 2021-01-13 8:07 ` [PATCH 29/30] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions Lee Jones 2021-01-13 8:07 ` [PATCH 30/30] drm/nouveau/dispnv50/disp: Include header containing our prototypes Lee Jones 2021-01-13 8:07 ` Lee Jones 2021-01-14 10:33 ` [PATCH 00/30] [Set 13] Finally rid W=1 warnings from GPU Lee Jones 2021-01-14 10:33 ` Lee Jones 2021-01-14 10:33 ` Lee Jones 2021-01-14 10:33 ` Lee Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210113080752.1003793-30-lee.jones@linaro.org \ --to=lee.jones@linaro.org \ --cc=airlied@linux.ie \ --cc=bskeggs@redhat.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=nouveau@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.