From patchwork Thu May 18 04:43:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 100042 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp547193qge; Wed, 17 May 2017 21:44:27 -0700 (PDT) X-Received: by 10.99.60.81 with SMTP id i17mr2305769pgn.183.1495082667754; Wed, 17 May 2017 21:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495082667; cv=none; d=google.com; s=arc-20160816; b=a0gDHF+GGwUYRquPTu56FBUT8o7femL8Ls+5KBBhKe8hHQ9DcZmv+0GT6y9wui45If Y54GoxiFeaiasdix3AaDnYUmiCb5ozXL7Os434qcC1Z5iq8Vq4ueUyPI09+c1pmn6B/K lH/ZcyGGWa364z49T4052M6o1gTRFwmMXEpWhV/stCxlFFvoHZbVegUP0EUyExkfJVUM vrGAPJJRQa6s4Maq1zRK0SlPE4sj40YHtJ+569iiQR1YAWXR3yM6EJP7YPg6IuOeVwe4 5vnbmwRnXYxBiE4cfGElhwoAZ30IhPWZmqgi6iZwWB+rYAal85m3Rs07e/2kgWS5HHLB JPkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=wd4vkPDxtdd23EQFLDsbgmg2SjL7aPiAVwqTFY+zrBw=; b=SqU+txp4v5BzVDlMPdvynD5/BJ/ERsmuPPuIKlrFQgcyCfGRwbBoZBclGs1sjIup41 P9MyxykECxJCWbsreYdXngeC25nrXicLTzEj1R3d1XF8q7vscJmQagYvhzl5TjBeISGt CEG5NbaEbEECeylySGiV4Ur/rro9ZNfGZWex8VNQihAs8SSy499BYgjYwPLdSYty/8mj dpFUnbW5kMwZXEUm6+JXU43+kect6pjISSoABo90H8alXpLsVzu2yVw+6bJiQqewB2gh KO9rGjNiicoozT7bd7zs9j80N3yYJ6On+7f7TICf+3kM2sx5KaVAVtHUvFmcJJM6RRP6 WiCw== 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 1si4138720pgm.130.2017.05.17.21.44.27; Wed, 17 May 2017 21:44:27 -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 S1753667AbdEREoT (ORCPT + 25 others); Thu, 18 May 2017 00:44:19 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:28001 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbdEREoP (ORCPT ); Thu, 18 May 2017 00:44:15 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id v4I4hdeK024243; Thu, 18 May 2017 13:43:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v4I4hdeK024243 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1495082620; bh=wd4vkPDxtdd23EQFLDsbgmg2SjL7aPiAVwqTFY+zrBw=; h=From:To:Cc:Subject:Date:From; b=VSnopNnfh9YKf8Qv0JJ5QGbUl6eaQJ6VJmjF6+t6qmcoeuDjnIQrT51+wzIfIXhIF VXSwpnh5oo2EQG24xYIUSQ4iz/B76qyzQ+xQbiM40T6QklEs6OngrtYA1KrAa1AyJ5 VYMlw6jwUBmonTV/hxs+T4vb3MoiMrZRRDDl9OunovMGKfJhv639Kwj8Umxws0Dn/8 XAyVQ7i/WEohS+WjrljiaRYjXbILMFyL+3IPXgtPgCJ9482kaV4HrSnUoCzLUsgkGs SS8pHRU+NqZ9blNX/Xjwa/aMJddZ5SWh0EnBt3MK72UkS6X4GxpJatqiVWE1f7aGbW Qj0M8qTbzkbAg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: dri-devel@lists.freedesktop.org, Daniel Vetter Cc: linux-kernel@vger.kernel.org, Oded Gabbay , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , amd-gfx@lists.freedesktop.org, =?utf-8?q?Michel_D=C3=A4nzer?= , Masahiro Yamada Subject: [PATCH] drm/amd: include instead of "linux/delay.h" Date: Thu, 18 May 2017 13:43:32 +0900 Message-Id: <1495082612-10385-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use <...> notation to include headers located in include/linux. While we are here, tweak the includes order a bit to sort them alphabetically. Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- 6 files changed, 16 insertions(+), 12 deletions(-) -- 2.7.4 Reviewed-by: Christian König diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index ff4ae3d..963a9e0 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -22,10 +22,10 @@ */ #include "pp_debug.h" -#include "linux/delay.h" -#include +#include #include #include +#include #include #include "cgs_common.h" #include "power_state.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c index f5e8fda..f6b4dd9 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c @@ -21,8 +21,8 @@ * */ +#include #include -#include "linux/delay.h" #include "hwmgr.h" #include "amd_acpi.h" #include "pp_acpi.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 8f663ab..581374d 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -21,11 +21,11 @@ * */ #include "pp_debug.h" +#include +#include #include #include -#include #include -#include "linux/delay.h" #include "pp_acpi.h" #include "ppatomctrl.h" #include "atombios.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c index 8394955..f4ab81b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c @@ -20,10 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ + +#include +#include #include #include -#include -#include "linux/delay.h" #include "hwmgr.h" #include "amd_powerplay.h" diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c index 1f6744a..39c7091 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c @@ -20,11 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include + +#include +#include #include #include -#include -#include "linux/delay.h" +#include + #include "cgs_common.h" #include "smu/smu_8_0_d.h" #include "smu/smu_8_0_sh_mask.h" diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index c0d7576..2e954a4 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c @@ -20,15 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include + +#include #include #include #include +#include #include #include "pp_instance.h" #include "smumgr.h" #include "cgs_common.h" -#include "linux/delay.h" MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");