Merge branch 'topic/dw' into for-linus
This commit is contained in:
commit
17d5159f41
|
@ -293,8 +293,7 @@ MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);
|
|||
|
||||
static int dw_suspend_late(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct dw_dma_chip *chip = platform_get_drvdata(pdev);
|
||||
struct dw_dma_chip *chip = dev_get_drvdata(dev);
|
||||
|
||||
dw_dma_disable(chip);
|
||||
clk_disable_unprepare(chip->clk);
|
||||
|
@ -304,8 +303,7 @@ static int dw_suspend_late(struct device *dev)
|
|||
|
||||
static int dw_resume_early(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct dw_dma_chip *chip = platform_get_drvdata(pdev);
|
||||
struct dw_dma_chip *chip = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = clk_prepare_enable(chip->clk);
|
||||
|
|
Loading…
Reference in New Issue
Block a user