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

Commit b9736a16 authored by Mark Brown's avatar Mark Brown Committed by Lee Jones
Browse files

mfd: wm831x: Use PM ops for shutdown 



This helps move us towards removing the bus custom operations.

Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ed83d301

drivers/mfd/wm831x-i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ static int wm831x_i2c_suspend(struct device *dev) 
	return wm831x_device_suspend(wm831x);

}



static void wm831x_i2c_shutdown(struct i2c_client *i2c)

static int wm831x_i2c_poweroff(struct device *dev)

{

	struct wm831x *wm831x = i2c_get_clientdata(i2c);

	struct wm831x *wm831x = dev_get_drvdata(dev);



	wm831x_device_shutdown(wm831x);



	return 0;

}



static const struct i2c_device_id wm831x_i2c_id[] = {
@@ -85,6 +87,7 @@ MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id); 


static const struct dev_pm_ops wm831x_pm_ops = {

	.suspend = wm831x_i2c_suspend,

	.poweroff = wm831x_i2c_poweroff,

};



static struct i2c_driver wm831x_i2c_driver = {
@@ -95,7 +98,6 @@ static struct i2c_driver wm831x_i2c_driver = { 
	},

	.probe = wm831x_i2c_probe,

	.remove = wm831x_i2c_remove,

	.shutdown = wm831x_i2c_shutdown,

	.id_table = wm831x_i2c_id,

};

drivers/mfd/wm831x-spi.c

+5 −3
Original line number Diff line number Diff line
@@ -66,16 +66,19 @@ static int wm831x_spi_suspend(struct device *dev) 
	return wm831x_device_suspend(wm831x);

}



static void wm831x_spi_shutdown(struct spi_device *spi)

static int wm831x_spi_poweroff(struct device *dev)

{

	struct wm831x *wm831x = spi_get_drvdata(spi);

	struct wm831x *wm831x = dev_get_drvdata(dev);



	wm831x_device_shutdown(wm831x);



	return 0;

}



static const struct dev_pm_ops wm831x_spi_pm = {

	.freeze = wm831x_spi_suspend,

	.suspend = wm831x_spi_suspend,

	.poweroff = wm831x_spi_poweroff,

};



static const struct spi_device_id wm831x_spi_ids[] = {
@@ -99,7 +102,6 @@ static struct spi_driver wm831x_spi_driver = { 
	.id_table	= wm831x_spi_ids,

	.probe		= wm831x_spi_probe,

	.remove		= wm831x_spi_remove,

	.shutdown	= wm831x_spi_shutdown,

};



static int __init wm831x_spi_init(void)