Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp6533164rdb; Fri, 15 Dec 2023 00:53:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGym8ma4R6NNm39S53StEuyp8oELdTsUR6QDOxJexuXIGYzC3vWjzLW1WvuTdWsBpV0/0xL X-Received: by 2002:a17:903:2448:b0:1d0:6ffe:9f6 with SMTP id l8-20020a170903244800b001d06ffe09f6mr12552709pls.84.1702630435425; Fri, 15 Dec 2023 00:53:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702630435; cv=none; d=google.com; s=arc-20160816; b=BHcIlsWXOXDgtBsLwy1CNjZO5kbWpM18ZzoPc+Ktqb5tq5q/TahrNBZ//q3MjYtxhU bjeCrSY3HNPDbeqnRfHAunglP42+UUxWBq3HNlTg3mg6A/KxkRVt9084zcFupH3kPuda e9cUA8DNjG0XgCAiwDT/3UfzRG6ny+MjjslbUN3c5+gzA213dneGkA7XA8/twSr4u5lf SNQvDZWzTLk46hgXe/R7mrV9m3LcfZyLJ7ORETTW3gZQvLXShmAdQ9K5Plk5Y8l0N1+R GgHsWhQQCQnXCJchK5z9GTLCQKTXd3Z+un1IJ25WjVDHnqfyQvXXjweqnykm95Ph0cHu e04w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date; bh=6+a0YpMoHI8DaVx5Ai54qtCpbNtGvkzegc1rScTX2C8=; fh=W6BtihY+giecPH/ykO9e3Lz3pkSY0lDMW4ItUYZmkWA=; b=g7eXkF/N1D8Xw76tuRJt/tCaPxYGeadW9ZeOsdxA8tlWjbEFACdmDDKHSN20+Ga66t PN4xVhTtbQ11GC4KwVNWYwwr76RKbeEanX+Uubu+QbUsVwxdUqraqbw3NshYzsTiAzMe R0ch4Tn1TD4N605K6ie5MwE9yGUeqgMfMjgHohlbKSqXFoyn9jCzlmv2U1YfEojyvMAH vhr7vMcGRBRq11HXwOGJelUDdYTX6pepf6rEpNxpmTOhenmJtE4PFK8C+NUbDHGT1TLf sL3nP2Xox1mlWiXpqrdhUf+4YbHNXO9TMOrFEenoBsd1qHvPsxuGibbThEbOqwUhFeCE o+Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-645-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-645-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id u14-20020a17090341ce00b001d09c96ba1esi13014175ple.452.2023.12.15.00.53.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:53:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-645-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-645-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-645-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 9B12BB22A21 for ; Fri, 15 Dec 2023 08:52:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D745517981; Fri, 15 Dec 2023 08:51:52 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from wxsgout04.xfusion.com (wxsgout03.xfusion.com [36.139.52.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCF8C171BB for ; Fri, 15 Dec 2023 08:51:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xfusion.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xfusion.com Received: from wuxshcsitd00600.xfusion.com (unknown [10.32.133.213]) by wxsgout04.xfusion.com (SkyGuard) with ESMTPS id 4Ss2tb3WG1zB1wtF; Fri, 15 Dec 2023 16:48:23 +0800 (CST) Received: from localhost (10.82.147.3) by wuxshcsitd00600.xfusion.com (10.32.133.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 15 Dec 2023 16:51:46 +0800 Date: Fri, 15 Dec 2023 16:51:45 +0800 From: Wang Jinchao To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , , CC: , Subject: [PATCH] drm: cleanup for including Message-ID: <202312151651+0800-wangjinchao@xfusion.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-ClientProxiedBy: wuxshcsitd00602.xfusion.com (10.32.132.250) To wuxshcsitd00600.xfusion.com (10.32.133.213) remove duplicated include merge two \#ifdef Signed-off-by: Wang Jinchao --- drivers/gpu/drm/drm_gem_shmem_helper.c | 1 - include/uapi/drm/drm.h | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index e435f986cd13..c510fac3385a 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -10,7 +10,6 @@ #include #include #include -#include #ifdef CONFIG_X86 #include diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index de723566c5ae..c7f5a21e47a2 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -35,13 +35,7 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__KERNEL__) - -#include -#include -typedef unsigned int drm_handle_t; - -#elif defined(__linux__) +#if defined(__KERNEL__) || defined(__linux__) #include #include -- 2.40.0