| Message ID | 20240429152207.479221-9-james.clark@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | coresight: Use per-sink trace ID maps for Perf sessions | expand |
On Mon, 29 Apr 2024 at 16:24, James Clark <james.clark@arm.com> wrote: > > This file is never included anywhere if CONFIG_CORESIGHT is not set so > they are unused and aren't currently compile tested with any config so > remove them. > > Signed-off-by: James Clark <james.clark@arm.com> > --- > .../hwtracing/coresight/coresight-etm-perf.h | 18 ------------------ > 1 file changed, 18 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h > index bebbadee2ceb..744531158d6b 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.h > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h > @@ -62,7 +62,6 @@ struct etm_event_data { > struct list_head * __percpu *path; > }; > > -#if IS_ENABLED(CONFIG_CORESIGHT) > int etm_perf_symlink(struct coresight_device *csdev, bool link); > int etm_perf_add_symlink_sink(struct coresight_device *csdev); > void etm_perf_del_symlink_sink(struct coresight_device *csdev); > @@ -77,23 +76,6 @@ static inline void *etm_perf_sink_config(struct perf_output_handle *handle) > int etm_perf_add_symlink_cscfg(struct device *dev, > struct cscfg_config_desc *config_desc); > void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc); > -#else > -static inline int etm_perf_symlink(struct coresight_device *csdev, bool link) > -{ return -EINVAL; } > -int etm_perf_add_symlink_sink(struct coresight_device *csdev) > -{ return -EINVAL; } > -void etm_perf_del_symlink_sink(struct coresight_device *csdev) {} > -static inline void *etm_perf_sink_config(struct perf_output_handle *handle) > -{ > - return NULL; > -} > -int etm_perf_add_symlink_cscfg(struct device *dev, > - struct cscfg_config_desc *config_desc) > -{ return -EINVAL; } > -void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc) {} > - > -#endif /* CONFIG_CORESIGHT */ > - > int __init etm_perf_init(void); > void etm_perf_exit(void); > > -- > 2.34.1 > Reviewed-by: Mike Leach <mike.leach@linaro.org>
Minor nit: Should the subject line be "coresight: Remove unused etm perf stubs" ? On 4/29/24 20:51, James Clark wrote: > This file is never included anywhere if CONFIG_CORESIGHT is not set so > they are unused and aren't currently compile tested with any config so > remove them. Searching for this header's inclusion throws up the following source files, all of which needs CONFIG_CORESIGHT to be enabled to be compiled. git grep "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-core.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-etb10.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-etm-perf.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-etm3x-core.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-etm4x-core.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-syscfg.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-tmc-etf.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-tmc-etr.c:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/coresight-trbe.h:#include "coresight-etm-perf.h" drivers/hwtracing/coresight/ultrasoc-smb.c:#include "coresight-etm-perf.h" > > Signed-off-by: James Clark <james.clark@arm.com> LGTM, with or without the subject line change. Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > .../hwtracing/coresight/coresight-etm-perf.h | 18 ------------------ > 1 file changed, 18 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h > index bebbadee2ceb..744531158d6b 100644 > --- a/drivers/hwtracing/coresight/coresight-etm-perf.h > +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h > @@ -62,7 +62,6 @@ struct etm_event_data { > struct list_head * __percpu *path; > }; > > -#if IS_ENABLED(CONFIG_CORESIGHT) > int etm_perf_symlink(struct coresight_device *csdev, bool link); > int etm_perf_add_symlink_sink(struct coresight_device *csdev); > void etm_perf_del_symlink_sink(struct coresight_device *csdev); > @@ -77,23 +76,6 @@ static inline void *etm_perf_sink_config(struct perf_output_handle *handle) > int etm_perf_add_symlink_cscfg(struct device *dev, > struct cscfg_config_desc *config_desc); > void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc); > -#else > -static inline int etm_perf_symlink(struct coresight_device *csdev, bool link) > -{ return -EINVAL; } > -int etm_perf_add_symlink_sink(struct coresight_device *csdev) > -{ return -EINVAL; } > -void etm_perf_del_symlink_sink(struct coresight_device *csdev) {} > -static inline void *etm_perf_sink_config(struct perf_output_handle *handle) > -{ > - return NULL; > -} > -int etm_perf_add_symlink_cscfg(struct device *dev, > - struct cscfg_config_desc *config_desc) > -{ return -EINVAL; } > -void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc) {} > - > -#endif /* CONFIG_CORESIGHT */ > - > int __init etm_perf_init(void); > void etm_perf_exit(void); >
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h index bebbadee2ceb..744531158d6b 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -62,7 +62,6 @@ struct etm_event_data { struct list_head * __percpu *path; }; -#if IS_ENABLED(CONFIG_CORESIGHT) int etm_perf_symlink(struct coresight_device *csdev, bool link); int etm_perf_add_symlink_sink(struct coresight_device *csdev); void etm_perf_del_symlink_sink(struct coresight_device *csdev); @@ -77,23 +76,6 @@ static inline void *etm_perf_sink_config(struct perf_output_handle *handle) int etm_perf_add_symlink_cscfg(struct device *dev, struct cscfg_config_desc *config_desc); void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc); -#else -static inline int etm_perf_symlink(struct coresight_device *csdev, bool link) -{ return -EINVAL; } -int etm_perf_add_symlink_sink(struct coresight_device *csdev) -{ return -EINVAL; } -void etm_perf_del_symlink_sink(struct coresight_device *csdev) {} -static inline void *etm_perf_sink_config(struct perf_output_handle *handle) -{ - return NULL; -} -int etm_perf_add_symlink_cscfg(struct device *dev, - struct cscfg_config_desc *config_desc) -{ return -EINVAL; } -void etm_perf_del_symlink_cscfg(struct cscfg_config_desc *config_desc) {} - -#endif /* CONFIG_CORESIGHT */ - int __init etm_perf_init(void); void etm_perf_exit(void);
This file is never included anywhere if CONFIG_CORESIGHT is not set so they are unused and aren't currently compile tested with any config so remove them. Signed-off-by: James Clark <james.clark@arm.com> --- .../hwtracing/coresight/coresight-etm-perf.h | 18 ------------------ 1 file changed, 18 deletions(-)