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

Commit 9d9f7800 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

iio: as3935: Switch to PM ops 



Switch from the legacy suspend/resume callbacks to device pm ops.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent b84894c7

drivers/iio/proximity/as3935.c

+10 −8
Original line number Diff line number Diff line
@@ -273,9 +273,9 @@ static void calibrate_as3935(struct as3935_state *st) 
}



#ifdef CONFIG_PM_SLEEP

static int as3935_suspend(struct spi_device *spi, pm_message_t msg)

static int as3935_suspend(struct device *dev)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct as3935_state *st = iio_priv(indio_dev);

	int val, ret;
@@ -293,9 +293,9 @@ static int as3935_suspend(struct spi_device *spi, pm_message_t msg) 
	return ret;

}



static int as3935_resume(struct spi_device *spi)

static int as3935_resume(struct device *dev)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct as3935_state *st = iio_priv(indio_dev);

	int val, ret;
@@ -311,9 +311,12 @@ static int as3935_resume(struct spi_device *spi) 


	return ret;

}



static SIMPLE_DEV_PM_OPS(as3935_pm_ops, as3935_suspend, as3935_resume);

#define AS3935_PM_OPS (&as3935_pm_ops)



#else

#define as3935_suspend	NULL

#define as3935_resume	NULL

#define AS3935_PM_OPS NULL

#endif



static int as3935_probe(struct spi_device *spi)
@@ -441,12 +444,11 @@ static struct spi_driver as3935_driver = { 
	.driver = {

		.name	= "as3935",

		.owner	= THIS_MODULE,

		.pm	= AS3935_PM_OPS,

	},

	.probe		= as3935_probe,

	.remove		= as3935_remove,

	.id_table	= as3935_id,

	.suspend	= as3935_suspend,

	.resume		= as3935_resume,

};

module_spi_driver(as3935_driver);