Merge branch 'topic/fsl' into for-linus
This commit is contained in:
commit
b30e70e6b4
@ -1328,8 +1328,7 @@ static int fsldma_of_remove(struct platform_device *op)
|
|||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int fsldma_suspend_late(struct device *dev)
|
static int fsldma_suspend_late(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_device *pdev = to_platform_device(dev);
|
struct fsldma_device *fdev = dev_get_drvdata(dev);
|
||||||
struct fsldma_device *fdev = platform_get_drvdata(pdev);
|
|
||||||
struct fsldma_chan *chan;
|
struct fsldma_chan *chan;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@ -1360,8 +1359,7 @@ out:
|
|||||||
|
|
||||||
static int fsldma_resume_early(struct device *dev)
|
static int fsldma_resume_early(struct device *dev)
|
||||||
{
|
{
|
||||||
struct platform_device *pdev = to_platform_device(dev);
|
struct fsldma_device *fdev = dev_get_drvdata(dev);
|
||||||
struct fsldma_device *fdev = platform_get_drvdata(pdev);
|
|
||||||
struct fsldma_chan *chan;
|
struct fsldma_chan *chan;
|
||||||
u32 mode;
|
u32 mode;
|
||||||
int i;
|
int i;
|
||||||
|
Loading…
Reference in New Issue
Block a user