From patchwork Thu Aug 25 21:19:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 74753 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1050228qga; Thu, 25 Aug 2016 14:29:18 -0700 (PDT) X-Received: by 10.67.7.70 with SMTP id da6mr19461130pad.111.1472160558233; Thu, 25 Aug 2016 14:29:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 185si17335629pfu.115.2016.08.25.14.29.17; Thu, 25 Aug 2016 14:29:18 -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=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759418AbcHYV3C (ORCPT + 27 others); Thu, 25 Aug 2016 17:29:02 -0400 Received: from mail-it0-f50.google.com ([209.85.214.50]:38833 "EHLO mail-it0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758750AbcHYV0t (ORCPT ); Thu, 25 Aug 2016 17:26:49 -0400 Received: by mail-it0-f50.google.com with SMTP id n128so113725462ith.1 for ; Thu, 25 Aug 2016 14:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IT06pkLxZJspdAMASoU8Gcc0iDnAsNCn25RXwVj9ugg=; b=Zb8Wk3HSDbGKPLtXX4FUiNfQeSego4lf0XRGJhVN0CkOBAFHEatNTjsfCAx+3GUkC0 rSoGqaGu3puQjm5HRGNr6S/LH27dYlt/7WluEaeBmN6ljYEmVHgAGTuYHkl8EuDUFskp kVsULLZ/1fZ65+/phef9gRlxrHjNSA2Ij4wf4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IT06pkLxZJspdAMASoU8Gcc0iDnAsNCn25RXwVj9ugg=; b=Tv6467eUphSv3QwrrHy3odC/2ypTE+SffjooJl7/ePdp92eOHZA6LeF/+B9/dNpLWp JShUUMNpiPX2g95sp+qfoZAtBA3PHtNeSZUZkkAkn52QrXSW5x2wa+vovbLYOmhLZTaN 9SuFjpePziESZx7Dt+ldCnfOVEs3uH7mqa4p7k1sC/i6ZQ2y9K0zgKmjqCBJFB08oFGc Pw7+zePXW7wGtMakGN8aQ+eujcVjex8XlPpKD9NcJiIobL5DOrOT/lW+uzAPc5mL3QBz Zc1ygQPTNzdLC0RkkOz7gimv6VMbqHoXXUCEQFl86seye41JYHFPWPa3R5LCKTHUaWZW mH6Q== X-Gm-Message-State: AE9vXwPbSf6aDxjgqW1IPnfXitQN7P9ZHiiQFqvKN4arI3T5aN3i/eMvPSRY8LgLoXzKRr+6 X-Received: by 10.107.157.134 with SMTP id g128mr12986052ioe.35.1472160003699; Thu, 25 Aug 2016 14:20:03 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id o5sm14506120ith.20.2016.08.25.14.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 14:20:03 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 21/28] coresight: remove duplicated enumeration Date: Thu, 25 Aug 2016 15:19:11 -0600 Message-Id: <1472159958-5981-22-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472159958-5981-1-git-send-email-mathieu.poirier@linaro.org> References: <1472159958-5981-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both ETMv3 and ETMv4 drivers are declaring an 'enum etm_addr_type', creating reduncancy. This patch removes the enumeration from the driver files and adds it to a common header. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm.h | 8 -------- drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 1 + drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 1 + drivers/hwtracing/coresight/coresight-etm4x.h | 8 -------- drivers/hwtracing/coresight/coresight-priv.h | 8 ++++++++ 5 files changed, 10 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h index 51597cb2c08a..4a18ee499965 100644 --- a/drivers/hwtracing/coresight/coresight-etm.h +++ b/drivers/hwtracing/coresight/coresight-etm.h @@ -259,14 +259,6 @@ struct etm_drvdata { struct etm_config config; }; -enum etm_addr_type { - ETM_ADDR_TYPE_NONE, - ETM_ADDR_TYPE_SINGLE, - ETM_ADDR_TYPE_RANGE, - ETM_ADDR_TYPE_START, - ETM_ADDR_TYPE_STOP, -}; - static inline void etm_writel(struct etm_drvdata *drvdata, u32 val, u32 off) { diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c index 4856c8098416..e9b071953f80 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c @@ -18,6 +18,7 @@ #include #include #include "coresight-etm.h" +#include "coresight-priv.h" static ssize_t nr_addr_cmp_show(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c index fd7ff613db17..b9b1e9c8f4c4 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c @@ -18,6 +18,7 @@ #include #include #include "coresight-etm4x.h" +#include "coresight-priv.h" static int etm4_set_mode_exclude(struct etmv4_drvdata *drvdata, bool exclude) { diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h index 2629954429a1..ba8d3f86de21 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.h +++ b/drivers/hwtracing/coresight/coresight-etm4x.h @@ -410,14 +410,6 @@ enum etm_addr_ctxtype { ETM_CTX_CTXID_VMID, }; -enum etm_addr_type { - ETM_ADDR_TYPE_NONE, - ETM_ADDR_TYPE_SINGLE, - ETM_ADDR_TYPE_RANGE, - ETM_ADDR_TYPE_START, - ETM_ADDR_TYPE_STOP, -}; - extern const struct attribute_group *coresight_etmv4_groups[]; void etm4_config_trace_mode(struct etmv4_config *config); #endif diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 39841d1f58e0..196a14be4b3d 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -56,6 +56,14 @@ static ssize_t name##_show(struct device *_dev, \ } \ static DEVICE_ATTR_RO(name) +enum etm_addr_type { + ETM_ADDR_TYPE_NONE, + ETM_ADDR_TYPE_SINGLE, + ETM_ADDR_TYPE_RANGE, + ETM_ADDR_TYPE_START, + ETM_ADDR_TYPE_STOP, +}; + enum cs_mode { CS_MODE_DISABLED, CS_MODE_SYSFS,