Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-block.git] / include / linux / coresight.h

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 1554021231f9c17680284cc93c3881f35189b488..f19a47b9bb5a4e7fd14270eaa3280bbbcd92df11 100644 (file)
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -61,6 +61,7 @@ enum coresight_dev_subtype_source {
        CORESIGHT_DEV_SUBTYPE_SOURCE_PROC,
        CORESIGHT_DEV_SUBTYPE_SOURCE_BUS,
        CORESIGHT_DEV_SUBTYPE_SOURCE_SOFTWARE,
+       CORESIGHT_DEV_SUBTYPE_SOURCE_OTHERS,
 };
 
 enum coresight_dev_subtype_helper {
@@ -314,14 +315,11 @@ struct coresight_ops_link {
  * Operations available for sources.
  * @cpu_id:    returns the value of the CPU number this component
  *             is associated to.
- * @trace_id:  returns the value of the component's trace ID as known
- *             to the HW.
  * @enable:    enables tracing for a source.
  * @disable:   disables tracing for a source.
  */
 struct coresight_ops_source {
        int (*cpu_id)(struct coresight_device *csdev);
-       int (*trace_id)(struct coresight_device *csdev);
        int (*enable)(struct coresight_device *csdev,
                      struct perf_event *event,  u32 mode);
        void (*disable)(struct coresight_device *csdev,