Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3796292pxb;
        Mon, 1 Feb 2021 05:08:08 -0800 (PST)
X-Google-Smtp-Source: ABdhPJykhL/jNWQFsET0e4lHSD4kLME716i1GxO3ZAN/Vyjr7Nk4e2EYVQrA1vqhzYStj8Rw+QUk
X-Received: by 2002:a17:906:5002:: with SMTP id s2mr17222053ejj.16.1612184888143;
        Mon, 01 Feb 2021 05:08:08 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1612184888; cv=none;
        d=google.com; s=arc-20160816;
        b=rrnro6LVrDAoXHGfEXJfsUG11yxEuY+5ZkrdngMPwMAoOOw7tditzfaZ0cBa/Lp2ej
         B5agNCZKZDXAs+BVvUiewy1ej2rFpZM0cldxI5gexB5+P7SXPp0zE4thMO/RLyjOlXu4
         t/QjoRlAgXNq7ZI2qSrv9sQpRWlZaTAgHik1/deWX91LH28I5pZAAP7Jx9yf3jFVH/cn
         aRpgdHGgYNvZIkS9sOwYsNUYH5AB//TKEURk59bvJNNM4J548xKZPIWJJIwDUvTwzLhK
         PODi65WBEX3eOshS85ha+FH45uSstuuycr3fvnSJaxs43rcS9Q3ba58hndwgr0X9lZyd
         nZRw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from;
        bh=+HenuMklI1f64LsjZgHQEfDJatRkNWdBtBh+l92CBYQ=;
        b=gMcYeo+6y6XQh5ts2mpX0vMi6Dn6MD50V8VDYdOTXb3OlisGNbK/3OxxhPDKHnLNWC
         tyQ8UIbsyCKSc8NeAMNeBurzfOiOfJA3BxjxOy8IssZWzM6J/ypmNEwm78q8XBXh2DuO
         HQINkEJWpIHkhtTBBcrTzpLmIJjzxTKyqlV789pfk6KqLHKsp3jP6pKJMVikFZ0DNJrs
         qoASZzA/yCJyr1nf5QDa/1ybbNoEj86Loa/1OCE+gkd06iXTGjnvmSvQmiYS3P9vS6A7
         G4PrexIQZ8b3Y9aVmntoftpY7DaLNNs+3UrD9KrY2UXNN0NPmnrOX0QM0U2moERL2lCz
         kb8A==
ARC-Authentication-Results: i=1; mx.google.com;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id di27si10825235edb.97.2021.02.01.05.07.35;
        Mon, 01 Feb 2021 05:08:08 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231478AbhBANFy (ORCPT <rfc822;lkml.akiyano@gmail.com>
        + 99 others); Mon, 1 Feb 2021 08:05:54 -0500
Received: from szxga04-in.huawei.com ([45.249.212.190]:11667 "EHLO
        szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229500AbhBANFw (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 1 Feb 2021 08:05:52 -0500
Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59])
        by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DTp6B2CmtzlF19;
        Mon,  1 Feb 2021 21:03:30 +0800 (CST)
Received: from localhost.localdomain (10.67.165.24) by
 DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id
 14.3.498.0; Mon, 1 Feb 2021 21:04:56 +0800
From:   Qi Liu <liuqi115@huawei.com>
To:     <mathieu.poirier@linaro.org>, <suzuki.poulose@arm.com>,
        <mike.leach@linaro.org>
CC:     <coresight@lists.linaro.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, <linuxarm@openeuler.org>
Subject: [PATCH] coresight: Remove duplicate header files of coresight drivers
Date:   Mon, 1 Feb 2021 21:02:44 +0800
Message-ID: <1612184564-26613-1-git-send-email-liuqi115@huawei.com>
X-Mailer: git-send-email 2.8.1
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.67.165.24]
X-CFilter-Loop: Reflected
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Remove duplicate included header files, as coresight-priv.h is included in
these coresight drivers.

Signed-off-by: Qi Liu <liuqi115@huawei.com>
---
 drivers/hwtracing/coresight/coresight-catu.c         | 2 --
 drivers/hwtracing/coresight/coresight-core.c         | 3 ---
 drivers/hwtracing/coresight/coresight-cpu-debug.c    | 3 ---
 drivers/hwtracing/coresight/coresight-cti-core.c     | 3 ---
 drivers/hwtracing/coresight/coresight-cti-platform.c | 1 -
 drivers/hwtracing/coresight/coresight-cti.h          | 1 -
 drivers/hwtracing/coresight/coresight-etb10.c        | 4 ----
 drivers/hwtracing/coresight/coresight-etm-perf.c     | 1 -
 drivers/hwtracing/coresight/coresight-etm3x-sysfs.c  | 1 -
 drivers/hwtracing/coresight/coresight-etm4x-core.c   | 5 -----
 drivers/hwtracing/coresight/coresight-etm4x-sysfs.c  | 1 -
 drivers/hwtracing/coresight/coresight-funnel.c       | 3 ---
 drivers/hwtracing/coresight/coresight-platform.c     | 2 --
 drivers/hwtracing/coresight/coresight-replicator.c   | 3 ---
 drivers/hwtracing/coresight/coresight-stm.c          | 3 ---
 drivers/hwtracing/coresight/coresight-tmc-core.c     | 3 ---
 drivers/hwtracing/coresight/coresight-tmc-etf.c      | 1 -
 drivers/hwtracing/coresight/coresight-tmc-etr.c      | 1 -
 drivers/hwtracing/coresight/coresight-tpiu.c         | 4 ----
 19 files changed, 45 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index a61313f..fcc0367 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -7,10 +7,8 @@
  * Author: Suzuki K Poulose <suzuki.poulose@arm.com>
  */

-#include <linux/amba/bus.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
-#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index 4ba801d..5fb8b12 100644
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -7,17 +7,14 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/device.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/stringhash.h>
 #include <linux/mutex.h>
 #include <linux/clk.h>
-#include <linux/coresight.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>
-#include <linux/pm_runtime.h>

 #include "coresight-etm-perf.h"
 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
index e1d2324..f8df512 100644
--- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
+++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
@@ -4,15 +4,12 @@
  *
  * Author: Leo Yan <leo.yan@linaro.org>
  */
-#include <linux/amba/bus.h>
-#include <linux/coresight.h>
 #include <linux/cpu.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/io.h>
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/hwtracing/coresight/coresight-cti-core.c b/drivers/hwtracing/coresight/coresight-cti-core.c
index 61dbc1a..ed7ab82 100644
--- a/drivers/hwtracing/coresight/coresight-cti-core.c
+++ b/drivers/hwtracing/coresight/coresight-cti-core.c
@@ -4,18 +4,15 @@
  * Author: Mike Leach <mike.leach@linaro.org>
  */

-#include <linux/amba/bus.h>
 #include <linux/atomic.h>
 #include <linux/bits.h>
 #include <linux/coresight.h>
 #include <linux/cpu_pm.h>
 #include <linux/cpuhotplug.h>
 #include <linux/device.h>
-#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/spinlock.h>

diff --git a/drivers/hwtracing/coresight/coresight-cti-platform.c b/drivers/hwtracing/coresight/coresight-cti-platform.c
index ccef04f..60b0580 100644
--- a/drivers/hwtracing/coresight/coresight-cti-platform.c
+++ b/drivers/hwtracing/coresight/coresight-cti-platform.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2019, The Linaro Limited. All rights reserved.
  */
-#include <linux/coresight.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/of.h>
diff --git a/drivers/hwtracing/coresight/coresight-cti.h b/drivers/hwtracing/coresight/coresight-cti.h
index acf7b54..0a3b313 100644
--- a/drivers/hwtracing/coresight/coresight-cti.h
+++ b/drivers/hwtracing/coresight/coresight-cti.h
@@ -7,7 +7,6 @@
 #ifndef _CORESIGHT_CORESIGHT_CTI_H
 #define _CORESIGHT_CORESIGHT_CTI_H

-#include <linux/coresight.h>
 #include <linux/device.h>
 #include <linux/fwnode.h>
 #include <linux/list.h>
diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c
index 0cf6f0b..8d5bc04 100644
--- a/drivers/hwtracing/coresight/coresight-etb10.c
+++ b/drivers/hwtracing/coresight/coresight-etb10.c
@@ -10,17 +10,13 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/device.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <linux/pm_runtime.h>
 #include <linux/seq_file.h>
-#include <linux/coresight.h>
-#include <linux/amba/bus.h>
 #include <linux/clk.h>
 #include <linux/circ_buf.h>
 #include <linux/mm.h>
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index bdc34ca..01aba63 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -4,7 +4,6 @@
  * Author: Mathieu Poirier <mathieu.poirier@linaro.org>
  */

-#include <linux/coresight.h>
 #include <linux/coresight-pmu.h>
 #include <linux/cpumask.h>
 #include <linux/device.h>
diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
index e8c7649..5cf6660 100644
--- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
@@ -5,7 +5,6 @@
  */

 #include <linux/pid_namespace.h>
-#include <linux/pm_runtime.h>
 #include <linux/sysfs.h>
 #include "coresight-etm.h"
 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index b20b6ff..0438ef7 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -3,13 +3,11 @@
  * Copyright (c) 2014, The Linux Foundation. All rights reserved.
  */

-#include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/device.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
@@ -20,14 +18,11 @@
 #include <linux/clk.h>
 #include <linux/cpu.h>
 #include <linux/cpu_pm.h>
-#include <linux/coresight.h>
 #include <linux/coresight-pmu.h>
 #include <linux/pm_wakeup.h>
-#include <linux/amba/bus.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/perf_event.h>
-#include <linux/pm_runtime.h>
 #include <linux/property.h>

 #include <asm/sections.h>
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
index 989ce7b..347ccb7 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
@@ -5,7 +5,6 @@
  */

 #include <linux/pid_namespace.h>
-#include <linux/pm_runtime.h>
 #include <linux/sysfs.h>
 #include "coresight-etm4x.h"
 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index 071c723..c79ded9 100644
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -15,9 +15,6 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/coresight.h>
-#include <linux/amba/bus.h>
 #include <linux/clk.h>

 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
index 3629b78..ca22409 100644
--- a/drivers/hwtracing/coresight/coresight-platform.c
+++ b/drivers/hwtracing/coresight/coresight-platform.c
@@ -13,8 +13,6 @@
 #include <linux/of_graph.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
-#include <linux/amba/bus.h>
-#include <linux/coresight.h>
 #include <linux/cpumask.h>
 #include <asm/smp_plat.h>

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index 7e2a2b7..36788de 100644
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -6,14 +6,11 @@
  */

 #include <linux/acpi.h>
-#include <linux/amba/bus.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/slab.h>
-#include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/clk.h>
 #include <linux/of.h>
diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c
index 9979177..75f0bd8 100644
--- a/drivers/hwtracing/coresight/coresight-stm.c
+++ b/drivers/hwtracing/coresight/coresight-stm.c
@@ -17,17 +17,14 @@
  */
 #include <asm/local.h>
 #include <linux/acpi.h>
-#include <linux/amba/bus.h>
 #include <linux/bitmap.h>
 #include <linux/clk.h>
-#include <linux/coresight.h>
 #include <linux/coresight-stm.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
 #include <linux/of_address.h>
 #include <linux/perf_event.h>
-#include <linux/pm_runtime.h>
 #include <linux/stm.h>

 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c
index 8169dff..4fff281 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-core.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-core.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/device.h>
 #include <linux/idr.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
@@ -21,8 +20,6 @@
 #include <linux/spinlock.h>
 #include <linux/pm_runtime.h>
 #include <linux/of.h>
-#include <linux/coresight.h>
-#include <linux/amba/bus.h>

 #include "coresight-priv.h"
 #include "coresight-tmc.h"
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
index 989d965..b263f75 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
@@ -6,7 +6,6 @@

 #include <linux/atomic.h>
 #include <linux/circ_buf.h>
-#include <linux/coresight.h>
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include "coresight-priv.h"
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index bf5230e..1ab0b28 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -5,7 +5,6 @@
  */

 #include <linux/atomic.h>
-#include <linux/coresight.h>
 #include <linux/dma-mapping.h>
 #include <linux/iommu.h>
 #include <linux/idr.h>
diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c
index d5dfee9..c5675f9 100644
--- a/drivers/hwtracing/coresight/coresight-tpiu.c
+++ b/drivers/hwtracing/coresight/coresight-tpiu.c
@@ -9,12 +9,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/io.h>
 #include <linux/err.h>
 #include <linux/slab.h>
-#include <linux/pm_runtime.h>
-#include <linux/coresight.h>
-#include <linux/amba/bus.h>
 #include <linux/clk.h>

 #include "coresight-priv.h"
--
2.8.1