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

Commit 8fbb2e98 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Kalle Valo
Browse files

cw1200: Fix suspend 



The cw1200 driver implements suspend and resume callbacks and assigns them
to the suspend and resume fields of the device_driver struct. These
callbacks are never actually called by anything though.

Modify the driver to properly use dev_pm_ops so that the suspend function
is actually executed upon suspend and drop the empty resume function.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0aef188a

drivers/net/wireless/cw1200/cw1200_spi.c

+4 −7
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int cw1200_spi_disconnect(struct spi_device *func) 
}



#ifdef CONFIG_PM

static int cw1200_spi_suspend(struct device *dev, pm_message_t state)

static int cw1200_spi_suspend(struct device *dev)

{

	struct hwbus_priv *self = spi_get_drvdata(to_spi_device(dev));
@@ -458,10 +458,8 @@ static int cw1200_spi_suspend(struct device *dev, pm_message_t state) 
	return 0;

}



static int cw1200_spi_resume(struct device *dev)

{

	return 0;

}

static SIMPLE_DEV_PM_OPS(cw1200_pm_ops, cw1200_spi_suspend, NULL);



#endif



static struct spi_driver spi_driver = {
@@ -472,8 +470,7 @@ static struct spi_driver spi_driver = { 
		.bus            = &spi_bus_type,

		.owner          = THIS_MODULE,

#ifdef CONFIG_PM

		.suspend        = cw1200_spi_suspend,

		.resume         = cw1200_spi_resume,

		.pm		= &cw1200_pm_ops,

#endif

	},

};