Merge series from Andy Shevchenko <andriy.shevchenko@linux.intel.com>: A couple of cleanups on top of recently added change.