Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: simplify code pattern as recommended by Mark Brown.