From patchwork Mon Nov 14 03:35:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 19535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1945285wru; Sun, 13 Nov 2022 19:42:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EM/iWG+5Arq71Eo5zzKrtWe+RF6Xm0CeM5Rt8t1IQ0wjFy1cmJKef7v0ufQPM9HHQFq6X X-Received: by 2002:a17:907:c203:b0:7ad:db82:d073 with SMTP id ti3-20020a170907c20300b007addb82d073mr9129863ejc.480.1668397343940; Sun, 13 Nov 2022 19:42:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668397343; cv=none; d=google.com; s=arc-20160816; b=FMx9ZlRKSTIDfa47WYcmyC1S4gZ1FrJelwsdm7u9ISCr0QUUMDN1alozk6oybX3Szw 90WDYPka1XqViv2GJDc63bUomGYsD60Zd6njpX7frCiqz9mefiVchMT6LwhmzpKyOroS aMRdyJuO8k2ABHaJr6RKhQN2pyBBb0DfzO1wJJxa9pQfDIZAWO0OA4vA7BgrPdcLyIr+ JNcPWaFNq8VcyHw3ya1LSWKjrkjFLa24roDhZg3z/b6dzU9R6iov8BWmY9hZTq6s6qGR rh1Cm9lMf5yCOwjodeNhflS47AIhjd1bSCH+oNDsooP5fm/7zmJ3wAafTiCzt7lUDiYK NFOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=sGZ7ZycAPJ52xgOK4TO7NwGFG51+UBh/dnUPN3s1ilw=; b=HYixk3Z6xFJ1HDBtdSdq1G689nmw420E+JJTeW993rni3cojgjBih6GrmsBwW9cK7/ cpLj7uGJAcG6G3cLFoXjfmJPR4TEzoeTaeKFWwqScQw6H0yQHjrvBZUZQtubOF2ieGKi NLIl9ohko0BCTAwCXlyb5xM7ahHhyVQaihTlPACLEngvG52Uz92NDIIt3lERU4T2oSuz edELrhHEURWj5PyA03uxEt7z2ftVCaqC5uWAZCToilHVIqJmRhXXlSD4b4SxwQwgBrVA H8JEG9ZGQu0SwRzd+rTbfK/B1frxFYJ59YMkCkJt21kTQxUO9C4QqeMoo/8/v7E2tW90 BsdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs34-20020a1709072d2200b00781dbee4273si9007054ejc.514.2022.11.13.19.41.58; Sun, 13 Nov 2022 19:42:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235717AbiKNDfO (ORCPT + 99 others); Sun, 13 Nov 2022 22:35:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235348AbiKNDfN (ORCPT ); Sun, 13 Nov 2022 22:35:13 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92EF415A0E for ; Sun, 13 Nov 2022 19:35:11 -0800 (PST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4N9Zgx2ZR1z4xVnR; Mon, 14 Nov 2022 11:35:09 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl1.zte.com.cn with SMTP id 2AE3Z10W017281; Mon, 14 Nov 2022 11:35:01 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp04[null]) by mapi (Zmail) with MAPI id mid14; Mon, 14 Nov 2022 11:35:03 +0800 (CST) Date: Mon, 14 Nov 2022 11:35:03 +0800 (CST) X-Zmail-TransId: 2b066371b767ffffffffd26f1041 X-Mailer: Zmail v1.0 Message-ID: <202211141135031107049@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next=5D_drm/nouveau/fifo=3A_remove_duplica?= =?utf-8?q?ted_included_chid=2Eh?= X-MAIL: mse-fl1.zte.com.cn 2AE3Z10W017281 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 6371B76D.000 by FangMail milter! X-FangMail-Envelope: 1668396909/4N9Zgx2ZR1z4xVnR/6371B76D.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6371B76D.000/4N9Zgx2ZR1z4xVnR X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749441413145752886?= X-GMAIL-MSGID: =?utf-8?q?1749441413145752886?= From: Xu Panda The chid.h is included more than once. Signed-off-by: Xu Panda Signed-off-by: Yang Yang --- drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c index b7c9d6115bce..b19a3612b62e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c @@ -24,7 +24,6 @@ #include "chan.h" #include "chid.h" #include "cgrp.h" -#include "chid.h" #include "runl.h" #include "priv.h"