Merge "ASoC: DPCM: Remove redundant code introduced during framework update"