[GIT PULL 04/15] intel_th: Output devices without ports don't need assigning

[Alexander Shishkin]

Output subdevices that rely on other output subdevices (or otherwise
don't directly talk to an output port on the switch) don't need to be
assigned an output port either.

Signed-off-by: Alexander Shishkin <alexander.shish...@linux.intel.com>
---
 drivers/hwtracing/intel_th/intel_th.h | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/hwtracing/intel_th/intel_th.h 
b/drivers/hwtracing/intel_th/intel_th.h
index 3096e7054f..c03f28ef64 100644
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -96,6 +96,16 @@ intel_th_device_get_resource(struct intel_th_device *thdev, 
unsigned int type,
        return NULL;
 }
 
+/*
+ * GTH, output ports configuration
+ */
+enum {
+       GTH_NONE = 0,
+       GTH_MSU,        /* memory/usb */
+       GTH_CTP,        /* Common Trace Port */
+       GTH_PTI = 4,    /* MIPI-PTI */
+};
+
 /**
  * intel_th_output_assigned() - if an output device is assigned to a switch 
port
  * @thdev:     the output device
@@ -106,7 +116,8 @@ static inline bool
 intel_th_output_assigned(struct intel_th_device *thdev)
 {
        return thdev->type == INTEL_TH_OUTPUT &&
-               thdev->output.port >= 0;
+               (thdev->output.port >= 0 ||
+                thdev->output.type == GTH_NONE);
 }
 
 /**
@@ -249,16 +260,6 @@ enum {
        REG_DCIH_LENGTH         = REG_MSU_LENGTH,
 };
 
-/*
- * GTH, output ports configuration
- */
-enum {
-       GTH_NONE = 0,
-       GTH_MSU,        /* memory/usb */
-       GTH_CTP,        /* Common Trace Port */
-       GTH_PTI = 4,    /* MIPI-PTI */
-};
-
 /*
  * Scratchpad bits: tell firmware and external debuggers
  * what we are up to.
-- 
2.14.1