Fix mismerge of 1605282... dmaengine/dma_slave: introduce inline wrappers

Change-Id: I9443929a42aa54af93a951b1c3a183dea4bae0df