From patchwork Thu May 18 04:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 100025 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp543872qge; Wed, 17 May 2017 21:31:11 -0700 (PDT) X-Received: by 10.98.192.80 with SMTP id x77mr2302891pff.1.1495081871497; Wed, 17 May 2017 21:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495081871; cv=none; d=google.com; s=arc-20160816; b=NnsPV2YAzzI6bTQSUcW/Yb9EOvFrzNWpeWy3kyA9SBNcwuynFYWndVlTj9BEoPPn99 koIuFUY/qanoYQOV5VMcVUT5akPK09WYAfAgIQe3pkfoylODBVk+q82HmdVx7ByYLM/w 2N5p/4n+yXucMUlGef8qZbYnKIn7s7Ab7l9h0XS8h7txoNvGaYemG8o19+rF31XZtStv GoAPd3KSdjST4cS6U4XWsdoelK2QffQFKhMOPGNS2htkka+zi42PQTQ712ZGaK4u3fUP WlGUFpYCeiNLOyDHCC6ytf0nYoNkqES7AyZD3LlPOW1VsNP25l/yfpxcvBxtgnzUjaVL Fo2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=cpRDn+Y+tQHdKx8LrPWM2kJxS+/hR/qvmxPvqWDHnHk=; b=kYA1tDsSWTG3FtBw/nTPB3nqyx3PZ7dlpH9QBV16my3mSis/cj8J9KBO9t0lnDN2Bq DVn679amPr0eZ5VUdH/eC28i3ERG+BpHeupBp59qrqefbcKkEhmpOOuhhSXp/p6kiYbe jNboUJ73w2xELtpsdoFw64DyMkam5JX+iJzJJX0VmTCACH+cP5orYqy+T9LIBr8xatZ7 uejNdhrCdcbzhRlz1z4f2BwAG/sr9lzT1V7EZlKtS52q4wKoYFOkjLbTOPtHPqAcuYA6 P6Auc+2+fVYbZPK/1vk1QIDwYT/aJ1Gf/MZFd3OpL3nM9n450ObtS/47PCtDWQvZ5Nz8 IU9g== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t21si4066452pfg.153.2017.05.17.21.31.10; Wed, 17 May 2017 21:31:11 -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 S1753628AbdEREa6 (ORCPT + 25 others); Thu, 18 May 2017 00:30:58 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:37107 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdEREa4 (ORCPT ); Thu, 18 May 2017 00:30:56 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v4I4U7ca023781; Thu, 18 May 2017 13:30:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v4I4U7ca023781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1495081810; bh=cpRDn+Y+tQHdKx8LrPWM2kJxS+/hR/qvmxPvqWDHnHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=StJ/ix1YEDk3YiP6ZVTNWwWo3bEADC3JkSmix64Nu3Oi5sokTOWV8EdNu/DvgKatH 9vC6OAe0PAOm2THc5aLGq5FdPr+eOixPu6ZIkjj6s12YykpKC92SGJaKtUMGTiqrTS X457JZUIoCjBCWYNu6/gJgxReZYvEn5ken2QSWJ/my433vTxu5YbgJ/G2V/snasl98 mqRFPTE6IWVk/ZwKRAEbJC+GJ7KI8Pe5Hzyluc1V7gUH/EveJfMAqi3NncVmmpvEym kLNURgHCyDRj5+tacoDLVCXvVG2BkpkvvaDwYzRqqakOr+NxxV/65TXhfJfHVHBcf7 JQOvg/KLMolKg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, Daniel Vetter Cc: David Airlie , Jani Nikula , Sean Paul , linux-kernel@vger.kernel.org, Masahiro Yamada , Eric Anholt Subject: [PATCH v3 01/16] drm/vc4: fix include notation and remove -Iinclude/drm flag Date: Thu, 18 May 2017 13:29:38 +0900 Message-Id: <1495081793-9707-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495081793-9707-1-git-send-email-yamada.masahiro@socionext.com> References: <1495081793-9707-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 and include/sound/*.h headers too. Signed-off-by: Masahiro Yamada --- Changes in v3: - Rebase 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 | 6 ++---- drivers/gpu/drm/vc4/vc4_dsi.c | 28 ++++++++++++++-------------- drivers/gpu/drm/vc4/vc4_hdmi.c | 30 +++++++++++++++--------------- 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 | 6 +++--- 11 files changed, 62 insertions(+), 65 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile index ab687fb..25bd5d3 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 1b4dbe9..0bfc4d8 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 8639749..136bb42 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 5ba2813..a97556f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -6,12 +6,10 @@ * published by the Free Software Foundation. */ -#include "drmP.h" -#include "drm_gem_cma_helper.h" -#include "drm_gem_cma_helper.h" - #include +#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 fdb3877..0ef41df 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 3c2723f6..ed63d4e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -42,21 +42,21 @@ * 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/pm_runtime.h" -#include "linux/rational.h" -#include "sound/dmaengine_pcm.h" -#include "sound/pcm_drm_eld.h" -#include "sound/pcm_params.h" -#include "sound/soc.h" +#include +#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_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 237a504..928d191 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 c53afec..5ae5518 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -16,9 +16,9 @@ * this program. If not, see . */ -#include "linux/clk.h" -#include "linux/component.h" -#include "linux/pm_runtime.h" +#include +#include +#include #include "vc4_drv.h" #include "vc4_regs.h"