coresight: remove duplicated enumeration
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 <mathieu.poirier@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
68905d73df
commit
2b7adc460f
|
@ -259,14 +259,6 @@ struct etm_drvdata {
|
||||||
struct etm_config config;
|
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,
|
static inline void etm_writel(struct etm_drvdata *drvdata,
|
||||||
u32 val, u32 off)
|
u32 val, u32 off)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
#include <linux/sysfs.h>
|
#include <linux/sysfs.h>
|
||||||
#include "coresight-etm.h"
|
#include "coresight-etm.h"
|
||||||
|
#include "coresight-priv.h"
|
||||||
|
|
||||||
static ssize_t nr_addr_cmp_show(struct device *dev,
|
static ssize_t nr_addr_cmp_show(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
#include <linux/sysfs.h>
|
#include <linux/sysfs.h>
|
||||||
#include "coresight-etm4x.h"
|
#include "coresight-etm4x.h"
|
||||||
|
#include "coresight-priv.h"
|
||||||
|
|
||||||
static int etm4_set_mode_exclude(struct etmv4_drvdata *drvdata, bool exclude)
|
static int etm4_set_mode_exclude(struct etmv4_drvdata *drvdata, bool exclude)
|
||||||
{
|
{
|
||||||
|
|
|
@ -410,14 +410,6 @@ enum etm_addr_ctxtype {
|
||||||
ETM_CTX_CTXID_VMID,
|
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[];
|
extern const struct attribute_group *coresight_etmv4_groups[];
|
||||||
void etm4_config_trace_mode(struct etmv4_config *config);
|
void etm4_config_trace_mode(struct etmv4_config *config);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -56,6 +56,14 @@ static ssize_t name##_show(struct device *_dev, \
|
||||||
} \
|
} \
|
||||||
static DEVICE_ATTR_RO(name)
|
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 {
|
enum cs_mode {
|
||||||
CS_MODE_DISABLED,
|
CS_MODE_DISABLED,
|
||||||
CS_MODE_SYSFS,
|
CS_MODE_SYSFS,
|
||||||
|
|
Loading…
Reference in New Issue