From patchwork Mon Apr 24 04:50:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97981 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1320740qgf; Sun, 23 Apr 2017 21:53:43 -0700 (PDT) X-Received: by 10.84.132.97 with SMTP id 88mr30826173ple.61.1493009623728; Sun, 23 Apr 2017 21:53:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o5si130997pgj.277.2017.04.23.21.53.43; Sun, 23 Apr 2017 21:53:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1164922AbdDXExh (ORCPT + 15 others); Mon, 24 Apr 2017 00:53:37 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:49044 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164797AbdDXEwN (ORCPT ); Mon, 24 Apr 2017 00:52:13 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v3O4oqMs025903; Mon, 24 Apr 2017 13:51:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3O4oqMs025903 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1493009462; bh=SZusMizlJdISrPfS/96Q3YRsv00wgPoagw28KIdW1P4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uq9CM3mOvPYKR516hzc1csFYD1uRaaHi4M15olCTHy4F9ePmwmJqNHmVzMAFHzJYh IVm68CNUeRtgt4OZ3VreDlZ1uio0Ja9P5cpMUb7wfvIHbijq7pUfVW+EInSuz9ibTk hOE723ynHqNl/PQ1B8R2BMNnVmpTqaX3Nq6r3Ms9zMOXoB7/mf82EEMgLWBR0VL1ye lie53ThoUm1SHLYmtp7ffbJKSU1Ko8uZJEWY1VGNURMMV+fA+4/6uEnioDiZ1OGVHZ yKNDRq4d7l4CAZ1PSUAzgreeAaz9uaJ/q8o3wVlMO5V+ElXPJ8rpLo6OIJz4xhekE0 PPCW60xtr727g== 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 15/29] drm/vc4: fix include notation and remove -Iinclude/drm flag Date: Mon, 24 Apr 2017 13:50:33 +0900 Message-Id: <1493009447-31524-16-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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Include instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. While we are here, use <...> instead of "..." for include/linux/*.h headers too. Signed-off-by: Masahiro Yamada --- Changes in v2: None drivers/gpu/drm/vc4/Makefile | 2 -- drivers/gpu/drm/vc4/vc4_crtc.c | 14 +++++++------- drivers/gpu/drm/vc4/vc4_dpi.c | 16 ++++++++-------- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.h | 5 ++--- drivers/gpu/drm/vc4/vc4_dsi.c | 28 ++++++++++++++-------------- drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++---------- drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 12 ++++++------ drivers/gpu/drm/vc4/vc4_plane.c | 9 +++++---- drivers/gpu/drm/vc4/vc4_v3d.c | 4 ++-- 11 files changed, 56 insertions(+), 58 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile index 61f45d1..f0efc7eb 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile @@ -1,5 +1,3 @@ -ccflags-y := -Iinclude/drm - # Please keep these build lists sorted! # core driver code diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index d86c8cc..34d2e8a 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -32,13 +32,13 @@ * ones that set the clock. */ -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "linux/clk.h" -#include "drm_fb_cma_helper.h" -#include "linux/component.h" -#include "linux/of_device.h" +#include +#include +#include +#include +#include +#include +#include #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c index c6d7039..39d6808 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c @@ -22,14 +22,14 @@ * ALT2 function. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "drm_panel.h" -#include "linux/clk.h" -#include "linux/component.h" -#include "linux/of_graph.h" -#include "linux/of_platform.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 61e674b..2037a5f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -31,7 +31,7 @@ #include #include #include -#include "drm_fb_cma_helper.h" +#include #include #include "uapi/drm/vc4_drm.h" diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index dffce629..ebfef52 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -6,10 +6,9 @@ * published by the Free Software Foundation. */ -#include "drmP.h" -#include "drm_gem_cma_helper.h" - +#include #include +#include struct vc4_dev { struct drm_device *dev; diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 160f981..d18c9b1 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -29,20 +29,20 @@ * hopefully present. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "drm_mipi_dsi.h" -#include "drm_panel.h" -#include "linux/clk.h" -#include "linux/clk-provider.h" -#include "linux/completion.h" -#include "linux/component.h" -#include "linux/dmaengine.h" -#include "linux/i2c.h" -#include "linux/of_address.h" -#include "linux/of_platform.h" -#include "linux/pm_runtime.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index e9cbe26..c91591c 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -42,16 +42,16 @@ * encoder block has CEC support. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "linux/clk.h" -#include "linux/component.h" -#include "linux/i2c.h" -#include "linux/of_address.h" -#include "linux/of_gpio.h" -#include "linux/of_platform.h" -#include "linux/rational.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "sound/dmaengine_pcm.h" #include "sound/pcm_drm_eld.h" #include "sound/pcm_params.h" diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index fd421ba..2b62fc5 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -22,7 +22,7 @@ * each CRTC. */ -#include "linux/component.h" +#include #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index ad7925a..3f2e64e 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -14,12 +14,12 @@ * crtc, HDMI encoder). */ -#include "drm_crtc.h" -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_plane_helper.h" -#include "drm_fb_cma_helper.h" +#include +#include +#include +#include +#include +#include #include "vc4_drv.h" static void vc4_output_poll_changed(struct drm_device *dev) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index d34cd53..da18dec 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -18,12 +18,13 @@ * into the region of the HVS that it has allocated for us. */ +#include +#include +#include +#include + #include "vc4_drv.h" #include "vc4_regs.h" -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_fb_cma_helper.h" -#include "drm_plane_helper.h" enum vc4_scaling_mode { VC4_SCALING_NONE, diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 7cc346a..b0f223f 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -16,8 +16,8 @@ * this program. If not, see . */ -#include "linux/component.h" -#include "linux/pm_runtime.h" +#include +#include #include "vc4_drv.h" #include "vc4_regs.h"