Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1164904AbdDXE5W (ORCPT ); Mon, 24 Apr 2017 00:57:22 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:48516 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164716AbdDXEvz (ORCPT ); Mon, 24 Apr 2017 00:51:55 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3O4oqMf025903 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , Jani Nikula , Sean Paul Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH v2 02/29] drm/ttm: fix include notation and remove -Iinclude/drm flag Date: Mon, 24 Apr 2017 13:50:20 +0900 Message-Id: <1493009447-31524-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com> References: <1493009447-31524-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3560 Lines: 127 For the C file, include instead of relative path from include/drm. For headers in include/drm/ttm, simplify the with "*.h". This allows us to remove the -Iinclude/drm compiler flag from drivers/gpu/drm/ttm/Makefile (and from other drivers' Makefiles). Signed-off-by: Masahiro Yamada --- Changes in v2: - Use #include "..." for headers (Michel Danzer) drivers/gpu/drm/ttm/Makefile | 1 - drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++--- include/drm/ttm/ttm_bo_driver.h | 9 +++++---- include/drm/ttm/ttm_execbuf_util.h | 3 ++- include/drm/ttm/ttm_lock.h | 3 ++- include/drm/ttm/ttm_object.h | 3 ++- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index f923258..4d0c938 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -1,7 +1,6 @@ # # Makefile for the drm device driver. This driver provides support for the -ccflags-y := -Iinclude/drm ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 9f53df9..b442d12 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -30,9 +30,9 @@ #define pr_fmt(fmt) "[TTM] " fmt -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 6bbd34d..990d529 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -30,10 +30,6 @@ #ifndef _TTM_BO_DRIVER_H_ #define _TTM_BO_DRIVER_H_ -#include -#include -#include -#include #include #include #include @@ -42,6 +38,11 @@ #include #include +#include "ttm_bo_api.h" +#include "ttm_memory.h" +#include "ttm_module.h" +#include "ttm_placement.h" + #define TTM_MAX_BO_PRIORITY 4U struct ttm_backend_func { diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h index 47f35b8..b0fdd19 100644 --- a/include/drm/ttm/ttm_execbuf_util.h +++ b/include/drm/ttm/ttm_execbuf_util.h @@ -31,9 +31,10 @@ #ifndef _TTM_EXECBUF_UTIL_H_ #define _TTM_EXECBUF_UTIL_H_ -#include #include +#include "ttm_bo_api.h" + /** * struct ttm_validate_buffer * diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h index 2902beb..0c3af98 100644 --- a/include/drm/ttm/ttm_lock.h +++ b/include/drm/ttm/ttm_lock.h @@ -49,10 +49,11 @@ #ifndef _TTM_LOCK_H_ #define _TTM_LOCK_H_ -#include #include #include +#include "ttm_object.h" + /** * struct ttm_lock * diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index 1487011..a98bfeb 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h @@ -42,7 +42,8 @@ #include #include #include -#include + +#include "ttm_memory.h" /** * enum ttm_ref_type -- 2.7.4