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, 18 insertions, 17 deletions

diff --git a/tools/perf/scripts/python/syscall-counts.py b/tools/perf/scripts/python/syscall-counts.py
index e66a7730aeb5..8adb95ff1664 100644
--- a/tools/perf/scripts/python/syscall-counts.py
+++ b/tools/perf/scripts/python/syscall-counts.py
@@ -5,6 +5,8 @@
 # Displays system-wide system call totals, broken down by syscall.
 # If a [comm] arg is specified, only syscalls called by [comm] are displayed.
 
+from __future__ import print_function
+
 import os
 import sys
 
@@ -28,14 +30,14 @@ if len(sys.argv) > 1:
 syscalls = autodict()
 
 def trace_begin():
-        print "Press control+C to stop and show the summary"
+        print("Press control+C to stop and show the summary")
 
 def trace_end():
         print_syscall_totals()
 
 def raw_syscalls__sys_enter(event_name, context, common_cpu,
-        common_secs, common_nsecs, common_pid, common_comm,
-        common_callchain, id, args):
+                common_secs, common_nsecs, common_pid, common_comm,
+                common_callchain, id, args):
         if for_comm is not None:
                 if common_comm != for_comm:
                         return
@@ -45,20 +47,19 @@ def raw_syscalls__sys_enter(event_name, context, common_cpu,
                 syscalls[id] = 1
 
 def syscalls__sys_enter(event_name, context, common_cpu,
-        common_secs, common_nsecs, common_pid, common_comm,
-        id, args):
+                common_secs, common_nsecs, common_pid, common_comm, id, args):
         raw_syscalls__sys_enter(**locals())
 
 def print_syscall_totals():
-    if for_comm is not None:
-            print "\nsyscall events for %s:\n\n" % (for_comm),
-    else:
-            print "\nsyscall events:\n\n",
-
-    print "%-40s  %10s\n" % ("event", "count"),
-    print "%-40s  %10s\n" % ("----------------------------------------", \
-                                 "-----------"),
-
-    for id, val in sorted(syscalls.iteritems(), key = lambda(k, v): (v, k), \
-                                  reverse = True):
-            print "%-40s  %10d\n" % (syscall_name(id), val),
+        if for_comm is not None:
+                print("\nsyscall events for %s:\n" % (for_comm))
+        else:
+                print("\nsyscall events:\n")
+
+        print("%-40s  %10s" % ("event", "count"))
+        print("%-40s  %10s" % ("----------------------------------------",
+                                "-----------"))
+
+        for id, val in sorted(syscalls.items(),
+                        key = lambda kv: (kv[1], kv[0]), reverse = True):
+                print("%-40s  %10d" % (syscall_name(id), val))