[alsa-devel] [PATCH 1/5] ASoC: ep93xx: get rid of ep93xx-pcm-audio struct device

[Stephen Warren]

On 12/09/2013 01:44 PM, Lars-Peter Clausen wrote:
> On 12/09/2013 09:24 PM, Stephen Warren wrote:
> [...]
>>  
>> -static int ep93xx_soc_platform_probe(struct platform_device *pdev)
>> +int ep93xx_pcm_platform_register(struct device *dev)
>>  {
>> -	return snd_dmaengine_pcm_register(&pdev->dev,
>> +	return snd_dmaengine_pcm_register(dev,
> 
> This will have a conflict with the "ASoC: ep93xx: Use
> devm_snd_dmaengine_pcm_register()" patch from the topic/ep93xx branch.

That's true. The conflict isn't conceptually that hard to resolve, but
probably a lot more than you want to do in a merge. I guess the way to
resolve it is to merge topic/ep93xx and topic/spear into topic/dma, then
to apply these patches on top. If that sounds good, I can rebase them
and resend.

... although that said, I'll need topic/dma as a dependency for that
Tegra DMA controller rework, and I'm not sure I want to pick up these
ep93xx/spear changes there, so I wonder if we should hold off doing the
merge and applying these patches until I've pulled in topic/dma, or
perhaps a separate topic branch is needed for this cleanup?