Unverified Commit be3206e8 authored by Dhruva Gole's avatar Dhruva Gole Committed by Mark Brown
Browse files

spi: cadence-quadspi: use macro DEFINE_SIMPLE_DEV_PM_OPS 



Using this macro makes the code more readable.
It also inits the members of dev_pm_ops in the following manner
without us explicitly needing to:

.suspend = cqspi_suspend, \
.resume = cqspi_resume, \
.freeze = cqspi_suspend, \
.thaw = cqspi_resume, \
.poweroff = cqspi_suspend, \
.restore = cqspi_resume

Also get rid of conditional compilation based on CONFIG_PM_SLEEP because
it introduces build issues with certain configs when CQSPI_DEV_PM_OPS is
just NULL.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202304191900.2fARFQW9-lkp@intel.com/


Fixes: 14062341 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller")
Signed-off-by: default avatarDhruva Gole <d-gole@ti.com>
Link: https://lore.kernel.org/r/20230420054257.925092-1-d-gole@ti.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 01875342

drivers/spi/spi-cadence-quadspi.c

+2 −11
Original line number Diff line number Diff line
@@ -1820,7 +1820,6 @@ static void cqspi_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



#ifdef CONFIG_PM_SLEEP

static int cqspi_suspend(struct device *dev)

{

	struct cqspi_st *cqspi = dev_get_drvdata(dev);
@@ -1850,15 +1849,7 @@ static int cqspi_resume(struct device *dev) 
	return spi_master_resume(master);

}



static const struct dev_pm_ops cqspi__dev_pm_ops = {

	.suspend = cqspi_suspend,

	.resume = cqspi_resume,

};



#define CQSPI_DEV_PM_OPS	(&cqspi__dev_pm_ops)

#else

#define CQSPI_DEV_PM_OPS	NULL

#endif

static DEFINE_SIMPLE_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend, cqspi_resume);



static const struct cqspi_driver_platdata cdns_qspi = {

	.quirks = CQSPI_DISABLE_DAC_MODE,
@@ -1933,7 +1924,7 @@ static struct platform_driver cqspi_platform_driver = { 
	.remove_new = cqspi_remove,

	.driver = {

		.name = CQSPI_NAME,

		.pm = CQSPI_DEV_PM_OPS,

		.pm = &cqspi_dev_pm_ops,

		.of_match_table = cqspi_dt_ids,

	},

};