Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.1

A few core fixes along with the driver specific ones, mainly fixing
small issues that only affect x86 platforms for various reasons (their
unusual machine enumeration mechanisms mainly, plus a fix for error
handling in topology).

There's some of the driver fixes that look larger than they are, like
the hdmi-codec changes which resulted in an indentation change, and most
of the other large changes are for new drivers like the STM32 changes.

1 files changed, 39 insertions, 37 deletions

diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py
index 334599c6032c..d2c22954800d 100644
--- a/tools/perf/scripts/python/check-perf-trace.py
+++ b/tools/perf/scripts/python/check-perf-trace.py
@@ -7,6 +7,8 @@
 # events, etc.  Basically, if this script runs successfully and
 # displays expected results, Python scripting support should be ok.
 
+from __future__ import print_function
+
 import os
 import sys
 
@@ -19,64 +21,64 @@ from perf_trace_context import *
 unhandled = autodict()
 
 def trace_begin():
-        print "trace_begin"
+        print("trace_begin")
         pass
 
 def trace_end():
-        print_unhandled()
+        print_unhandled()
 
 def irq__softirq_entry(event_name, context, common_cpu,
-        common_secs, common_nsecs, common_pid, common_comm,
-        common_callchain, vec):
-                print_header(event_name, common_cpu, common_secs, common_nsecs,
-                        common_pid, common_comm)
+                       common_secs, common_nsecs, common_pid, common_comm,
+                       common_callchain, vec):
+        print_header(event_name, common_cpu, common_secs, common_nsecs,
+                common_pid, common_comm)
 
-                print_uncommon(context)
+        print_uncommon(context)
 
-                print "vec=%s\n" % \
-                (symbol_str("irq__softirq_entry", "vec", vec)),
+        print("vec=%s" % (symbol_str("irq__softirq_entry", "vec", vec)))
 
 def kmem__kmalloc(event_name, context, common_cpu,
-        common_secs, common_nsecs, common_pid, common_comm,
-        common_callchain, call_site, ptr, bytes_req, bytes_alloc,
-        gfp_flags):
-                print_header(event_name, common_cpu, common_secs, common_nsecs,
-                        common_pid, common_comm)
+                  common_secs, common_nsecs, common_pid, common_comm,
+                  common_callchain, call_site, ptr, bytes_req, bytes_alloc,
+                  gfp_flags):
+        print_header(event_name, common_cpu, common_secs, common_nsecs,
+                common_pid, common_comm)
 
-                print_uncommon(context)
+        print_uncommon(context)
 
-                print "call_site=%u, ptr=%u, bytes_req=%u, " \
-                "bytes_alloc=%u, gfp_flags=%s\n" % \
+        print("call_site=%u, ptr=%u, bytes_req=%u, "
+                "bytes_alloc=%u, gfp_flags=%s" %
                 (call_site, ptr, bytes_req, bytes_alloc,
-
-                flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)),
+                flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)))
 
 def trace_unhandled(event_name, context, event_fields_dict):
-    try:
-        unhandled[event_name] += 1
-    except TypeError:
-        unhandled[event_name] = 1
+        try:
+                unhandled[event_name] += 1
+        except TypeError:
+                unhandled[event_name] = 1
 
 def print_header(event_name, cpu, secs, nsecs, pid, comm):
-        print "%-20s %5u %05u.%09u %8u %-20s " % \
-        (event_name, cpu, secs, nsecs, pid, comm),
+        print("%-20s %5u %05u.%09u %8u %-20s " %
+                (event_name, cpu, secs, nsecs, pid, comm),
+                end=' ')
 
 # print trace fields not included in handler args
 def print_uncommon(context):
-    print "common_preempt_count=%d, common_flags=%s, common_lock_depth=%d, " \
-        % (common_pc(context), trace_flag_str(common_flags(context)), \
-               common_lock_depth(context))
+        print("common_preempt_count=%d, common_flags=%s, "
+                "common_lock_depth=%d, " %
+                (common_pc(context), trace_flag_str(common_flags(context)),
+                common_lock_depth(context)))
 
 def print_unhandled():
-    keys = unhandled.keys()
-    if not keys:
-        return
+        keys = unhandled.keys()
+        if not keys:
+                return
 
-    print "\nunhandled events:\n\n",
+        print("\nunhandled events:\n")
 
-    print "%-40s  %10s\n" % ("event", "count"),
-    print "%-40s  %10s\n" % ("----------------------------------------", \
-                                 "-----------"),
+        print("%-40s  %10s" % ("event", "count"))
+        print("%-40s  %10s" % ("----------------------------------------",
+                                "-----------"))
 
-    for event_name in keys:
-        print "%-40s  %10d\n" % (event_name, unhandled[event_name])
+        for event_name in keys:
+                print("%-40s  %10d\n" % (event_name, unhandled[event_name]))