Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbeb91fe authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Vinod Koul
Browse files

dmaengine: sa11x0: remove broken #ifdef 



The sa11x0_dma_pm_ops unconditionally reference sa11x0_dma_resume
and sa11x0_dma_suspend, which currently breaks if CONFIG_PM_SLEEP
is disabled.

There is probably a better way to remove the reference in this
case, but the safe choice is to have the suspend/resume code always
built in the driver.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: dmaengine@vger.kernel.org
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a8246fed

drivers/dma/sa11x0-dma.c

+0 −4
Original line number Diff line number Diff line
@@ -113,11 +113,9 @@ struct sa11x0_dma_phy { 
	struct sa11x0_dma_desc	*txd_load;

	unsigned		sg_done;

	struct sa11x0_dma_desc	*txd_done;

#ifdef CONFIG_PM_SLEEP

	u32			dbs[2];

	u32			dbt[2];

	u32			dcsr;

#endif

};



struct sa11x0_dma_dev {
@@ -984,7 +982,6 @@ static int sa11x0_dma_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int sa11x0_dma_suspend(struct device *dev)

{

	struct sa11x0_dma_dev *d = dev_get_drvdata(dev);
@@ -1054,7 +1051,6 @@ static int sa11x0_dma_resume(struct device *dev) 


	return 0;

}

#endif



static const struct dev_pm_ops sa11x0_dma_pm_ops = {

	.suspend_noirq = sa11x0_dma_suspend,