Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp751477ybg; Sun, 26 Jul 2020 21:02:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzGziF8nqJgL8K3QMI57OEJhoY01L8o9Uqvk8Megqlt6oCnewfkoQ05/68ccKxEzO9cqQh X-Received: by 2002:a17:906:2c02:: with SMTP id e2mr18764829ejh.64.1595822548441; Sun, 26 Jul 2020 21:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595822548; cv=none; d=google.com; s=arc-20160816; b=MI9JP0dMNCs8h5IjfnDP9UN4T2T3xVhwOg7Y3lfrFaY7JEcFD6ZZ7ZiaIYJz0jOzzT agZLuIexpzLEdyEdQB9hKN9XdokVFmZrchHXlatHm8WpPUveiE5/J4XtFJWkmFgSp5eJ CGw/8hIrvI30VFsJOyUBbJbcsRPFfhuz5sPK3mMD1oIq/L7iAGruNHzdPTCKnvf2hWUB HbK9M/CB45cFoBVDu7PgN3pPwHDC/TD3I2adsyMNMHsO+0C+pET/U2dYtlfOXITWT0G5 nYh4e0qWqeraL/q25WCTgPLakxQdnyDHQYPfaECbughEl56Rkdc3HIgvFkqs0WoOycXe lk0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=a+oGIkmuwRsEJDavQJfaxtSXn8qLO3jtLI8b3iQgIaU=; b=Zoy3svF5FkqFpAT/5rGZGBfGHX1Clo5rN3/KcJiDirVUdKjomewfu/OMuLZ9nFQHNr CB8gsvjEZmyzP7v/BzjYo3zzeAYmnVXOHJxqEKk3yhvAs3dHmdLevvQEzs6EzaaJewW2 33nJTVH3YYynwO5r472hXOXGKUbmm/Pehkq4wqX3iIj7hwe8JLu/Koc8gJXTEWQofy4m noNJjJkRcDqhzife05j9F5L6l4V7flgaCeAqQnGzXaw91f07MgYi+hHc2Teg4Gidr+n3 Q8tKfDnQnsEl6u9pU87uNgg0/ajjOWUjLlMBM3PzF6gm+NU6Y+CZxadTUYP8W775konD bs0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w18si4774574ejk.216.2020.07.26.21.02.06; Sun, 26 Jul 2020 21:02:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726911AbgG0D6x (ORCPT + 99 others); Sun, 26 Jul 2020 23:58:53 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:8829 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726676AbgG0D6x (ORCPT ); Sun, 26 Jul 2020 23:58:53 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id A40D314EB9C7481BCB8C; Mon, 27 Jul 2020 11:58:51 +0800 (CST) Received: from huawei.com (10.175.104.57) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Mon, 27 Jul 2020 11:58:50 +0800 From: Peng Wu To: , , , , CC: , , Subject: [PATCH -next] crc:Fix build errors Date: Mon, 27 Jul 2020 12:00:18 +0800 Message-ID: <1595822418-34124-1-git-send-email-wupeng58@huawei.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.175.104.57] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If CONFIG_DRM_NOUVEAU=y,the following errors are seen while building crc.h. In file included from /scratch/linux/drivers/gpu/drm/nouveau/nouveau_display.c:47: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_head_crc_late_register’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:109:47: error: parameter name omitted static inline int nv50_head_crc_late_register(struct nv50_head *) {} ^~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:109:54: warning: no return statement in function returning non-void [-Wreturn-type] static inline int nv50_head_crc_late_register(struct nv50_head *) {} ^~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_handle_vblank’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:111:57: warning: ‘return’ with a value, in function returning void nv50_crc_handle_vblank(struct nv50_head *head) { return 0; } ^ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:111:1: note: declared here nv50_crc_handle_vblank(struct nv50_head *head) { return 0; } ^~~~~~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_check_head’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:114:28: error: parameter name omitted nv50_crc_atomic_check_head(struct nv50_head *, struct nv50_head_atom *, ^~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:114:48: error: parameter name omitted nv50_crc_atomic_check_head(struct nv50_head *, struct nv50_head_atom *, ^~~~~~~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:115:7: error: parameter name omitted struct nv50_head_atom *) {} ^~~~~~~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:115:14: warning: no return statement in function returning non-void [-Wreturn-type] struct nv50_head_atom *) {} ^~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_stop_reporting’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:118:32: error: parameter name omitted nv50_crc_atomic_stop_reporting(struct drm_atomic_state *) {} ^~~~~~~~~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_init_notifier_contexts’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:120:40: error: parameter name omitted nv50_crc_atomic_init_notifier_contexts(struct drm_atomic_state *) {} ^~~~~~~~~~~~~~~~~~~~~~~~~ /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_release_notifier_contexts’: /scratch/linux/drivers/gpu/drm/nouveau/dispnv50/crc.h:122:43: error: parameter name omitted Signed-off-by: Peng Wu --- drivers/gpu/drm/nouveau/dispnv50/crc.h | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.h b/drivers/gpu/drm/nouveau/dispnv50/crc.h index 4bc59e7..3da16cd 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/crc.h +++ b/drivers/gpu/drm/nouveau/dispnv50/crc.h @@ -76,22 +76,22 @@ struct nv50_crc { }; void nv50_crc_init(struct drm_device *dev); -int nv50_head_crc_late_register(struct nv50_head *); +int nv50_head_crc_late_register(struct nv50_head *head); void nv50_crc_handle_vblank(struct nv50_head *head); -int nv50_crc_verify_source(struct drm_crtc *, const char *, size_t *); -const char *const *nv50_crc_get_sources(struct drm_crtc *, size_t *); -int nv50_crc_set_source(struct drm_crtc *, const char *); +int nv50_crc_verify_source(struct drm_crtc *crtc, const char *source_name, size_t *values_cnt); +const char *const *nv50_crc_get_sources(struct drm_crtc *crtc, size_t *count); +int nv50_crc_set_source(struct drm_crtc *crtc, const char *source_str); -int nv50_crc_atomic_check_head(struct nv50_head *, struct nv50_head_atom *, - struct nv50_head_atom *); +int nv50_crc_atomic_check_head(struct nv50_head *head, struct nv50_head_atom *asyh, + struct nv50_head_atom *armh); void nv50_crc_atomic_check_outp(struct nv50_atom *atom); -void nv50_crc_atomic_stop_reporting(struct drm_atomic_state *); -void nv50_crc_atomic_init_notifier_contexts(struct drm_atomic_state *); -void nv50_crc_atomic_release_notifier_contexts(struct drm_atomic_state *); -void nv50_crc_atomic_start_reporting(struct drm_atomic_state *); -void nv50_crc_atomic_set(struct nv50_head *, struct nv50_head_atom *); -void nv50_crc_atomic_clr(struct nv50_head *); +void nv50_crc_atomic_stop_reporting(struct drm_atomic_state *state); +void nv50_crc_atomic_init_notifier_contexts(struct drm_atomic_state *state); +void nv50_crc_atomic_release_notifier_contexts(struct drm_atomic_state *state); +void nv50_crc_atomic_start_reporting(struct drm_atomic_state *state); +void nv50_crc_atomic_set(struct nv50_head *head, struct nv50_head_atom *asyh); +void nv50_crc_atomic_clr(struct nv50_head *head); extern const struct nv50_crc_func crc907d; extern const struct nv50_crc_func crcc37d; @@ -106,26 +106,26 @@ struct nv50_crc_atom {}; #define nv50_crc_set_source NULL static inline void nv50_crc_init(struct drm_device *dev) {} -static inline int nv50_head_crc_late_register(struct nv50_head *) {} +static inline int nv50_head_crc_late_register(struct nv50_head *head) { return 0; } static inline void -nv50_crc_handle_vblank(struct nv50_head *head) { return 0; } +nv50_crc_handle_vblank(struct nv50_head *head) {} static inline int -nv50_crc_atomic_check_head(struct nv50_head *, struct nv50_head_atom *, - struct nv50_head_atom *) {} +nv50_crc_atomic_check_head(struct nv50_head *head, struct nv50_head_atom *asyh, + struct nv50_head_atom *armh) { return 0; } static inline void nv50_crc_atomic_check_outp(struct nv50_atom *atom) {} static inline void -nv50_crc_atomic_stop_reporting(struct drm_atomic_state *) {} +nv50_crc_atomic_stop_reporting(struct drm_atomic_state *state) {} static inline void -nv50_crc_atomic_init_notifier_contexts(struct drm_atomic_state *) {} +nv50_crc_atomic_init_notifier_contexts(struct drm_atomic_state *state) {} static inline void -nv50_crc_atomic_release_notifier_contexts(struct drm_atomic_state *) {} +nv50_crc_atomic_release_notifier_contexts(struct drm_atomic_state *state) {} static inline void -nv50_crc_atomic_start_reporting(struct drm_atomic_state *) {} +nv50_crc_atomic_start_reporting(struct drm_atomic_state *state) {} static inline void -nv50_crc_atomic_set(struct nv50_head *, struct nv50_head_atom *) {} +nv50_crc_atomic_set(struct nv50_head *head, struct nv50_head_atom *asyh) {} static inline void -nv50_crc_atomic_clr(struct nv50_head *) {} +nv50_crc_atomic_clr(struct nv50_head *head) {} #endif /* IS_ENABLED(CONFIG_DEBUG_FS) */ #endif /* !__NV50_CRC_H__ */ -- 2.7.4