diff options
Diffstat (limited to 'drivers/dma/sh/shdmac.c')
| -rw-r--r-- | drivers/dma/sh/shdmac.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index b2431aa30033..9f1d4c7dbab8 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c | |||
| @@ -582,15 +582,12 @@ static void sh_dmae_chan_remove(struct sh_dmae_device *shdev) | |||
| 582 | } | 582 | } |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | static void sh_dmae_shutdown(struct platform_device *pdev) | ||
| 586 | { | ||
| 587 | struct sh_dmae_device *shdev = platform_get_drvdata(pdev); | ||
| 588 | sh_dmae_ctl_stop(shdev); | ||
| 589 | } | ||
| 590 | |||
| 591 | #ifdef CONFIG_PM | 585 | #ifdef CONFIG_PM |
| 592 | static int sh_dmae_runtime_suspend(struct device *dev) | 586 | static int sh_dmae_runtime_suspend(struct device *dev) |
| 593 | { | 587 | { |
| 588 | struct sh_dmae_device *shdev = dev_get_drvdata(dev); | ||
| 589 | |||
| 590 | sh_dmae_ctl_stop(shdev); | ||
| 594 | return 0; | 591 | return 0; |
| 595 | } | 592 | } |
| 596 | 593 | ||
| @@ -605,6 +602,9 @@ static int sh_dmae_runtime_resume(struct device *dev) | |||
| 605 | #ifdef CONFIG_PM_SLEEP | 602 | #ifdef CONFIG_PM_SLEEP |
| 606 | static int sh_dmae_suspend(struct device *dev) | 603 | static int sh_dmae_suspend(struct device *dev) |
| 607 | { | 604 | { |
| 605 | struct sh_dmae_device *shdev = dev_get_drvdata(dev); | ||
| 606 | |||
| 607 | sh_dmae_ctl_stop(shdev); | ||
| 608 | return 0; | 608 | return 0; |
| 609 | } | 609 | } |
| 610 | 610 | ||
| @@ -929,13 +929,12 @@ static int sh_dmae_remove(struct platform_device *pdev) | |||
| 929 | } | 929 | } |
| 930 | 930 | ||
| 931 | static struct platform_driver sh_dmae_driver = { | 931 | static struct platform_driver sh_dmae_driver = { |
| 932 | .driver = { | 932 | .driver = { |
| 933 | .pm = &sh_dmae_pm, | 933 | .pm = &sh_dmae_pm, |
| 934 | .name = SH_DMAE_DRV_NAME, | 934 | .name = SH_DMAE_DRV_NAME, |
| 935 | .of_match_table = sh_dmae_of_match, | 935 | .of_match_table = sh_dmae_of_match, |
| 936 | }, | 936 | }, |
| 937 | .remove = sh_dmae_remove, | 937 | .remove = sh_dmae_remove, |
| 938 | .shutdown = sh_dmae_shutdown, | ||
| 939 | }; | 938 | }; |
| 940 | 939 | ||
| 941 | static int __init sh_dmae_init(void) | 940 | static int __init sh_dmae_init(void) |
