mfd: Convert WM831x SPI to use dev_pm_ops
Subsystems (2)
PATCH 1/2 mfd: Convert WM831x SPI to use dev_pm_ops
There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the WM831x SPI driver.
--- drivers/mfd/wm831x-spi.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-)
drivers/mfd/wm831x-spi.c +15 -9
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/module.h> +#include <linux/pm.h> #include <linux/spi/spi.h> #include <linux/mfd/wm831x/core.h>
@@ -113,22 +114,27 @@ static int __devexit wm831x_spi_remove(struct spi_device *spi)return 0 ; } -static int wm831x_spi_suspend (struct spi_device *spi,pm_message_t m) +static int wm831x_spi_suspend (struct device *dev) { -struct wm831x *wm831x =dev_get_drvdata (&spi->dev); +struct wm831x *wm831x =dev_get_drvdata (dev);return wm831x_device_suspend (wm831x); } +static const struct dev_pm_ops wm831x_spi_pm = { + .freeze = wm831x_spi_suspend, + .suspend = wm831x_spi_suspend, +}; +static struct spi_driver wm8310_spi_driver = { .driver = { .name ="wm8310" , .bus = &spi_bus_type, .owner =THIS_MODULE , + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove =__devexit_p (wm831x_spi_remove), - .suspend = wm831x_spi_suspend, };static struct spi_driver wm8311_spi_driver = {
@@ -136,10 +142,10 @@ static struct spi_driver wm8311_spi_driver = { .name = "wm8311", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, }; static struct spi_driver wm8312_spi_driver = {
@@ -147,10 +153,10 @@ static struct spi_driver wm8312_spi_driver = { .name = "wm8312", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, }; static struct spi_driver wm8320_spi_driver = {
@@ -158,10 +164,10 @@ static struct spi_driver wm8320_spi_driver = { .name = "wm8320", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, }; static struct spi_driver wm8321_spi_driver = {
@@ -169,10 +175,10 @@ static struct spi_driver wm8321_spi_driver = { .name = "wm8321", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, }; static struct spi_driver wm8325_spi_driver = {
@@ -180,10 +186,10 @@ static struct spi_driver wm8325_spi_driver = { .name = "wm8325", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, }; static struct spi_driver wm8326_spi_driver = {
@@ -191,10 +197,10 @@ static struct spi_driver wm8326_spi_driver = { .name = "wm8326", .bus = &spi_bus_type, .owner = THIS_MODULE, + .pm = &wm831x_spi_pm, }, .probe = wm831x_spi_probe, .remove = __devexit_p(wm831x_spi_remove), - .suspend = wm831x_spi_suspend, };static int __init wm831x_spi_init (void )
Signature · 1 line
1.7.2.3
PATCH 2/2 mfd: Add fast path for WM831x touchscreen interrupts
The WM831x interrupt controller provides reporting of the touchscreen related interrupts in the primary interrupt status register as a performance optimisation - use this to avoid reading the secondary status registers for those interrupts.
For code simplicity and to avoid iterating over all interrupts we open code for the two affected interrupt sources.
--- drivers/mfd/wm831x-irq.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/mfd/wm831x-irq.c +12 -0
@@ -449,6 +449,18 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data) goto out; } +/* The touch interrupts are visible in the primary register as +* an optimisation; open code this to avoid complicating the +* main handling loop and so we can also skip iterating the +* descriptors. +*/ +if (primary &WM831X_TCHPD_INT ) +handle_nested_irq (wm831x->irq_base +WM831X_IRQ_TCHPD ); +if (primary &WM831X_TCHDATA_INT ) +handle_nested_irq (wm831x->irq_base +WM831X_IRQ_TCHDATA ); +if (primary & (WM831X_TCHDATA_EINT |WM831X_TCHPD_EINT )) + goto out; +for (i =0 ; i <ARRAY_SIZE (wm831x_irqs); i++) {int offset = wm831x_irqs[i].reg -1 ;
Signature · 1 line
1.7.2.3
Re: [PATCH 2/2] mfd: Add fast path for WM831x touchscreen interrupts
Hi Mark,
Quoted 7 lines · Mark Brown
The WM831x interrupt controller provides reporting of the touchscreen related interrupts in the primary interrupt status register as a performance optimisation - use this to avoid reading the secondary status registers for those interrupts.
For code simplicity and to avoid iterating over all interrupts we open code for the two affected interrupt sources.
Patch applied as well, thanks.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Hi Mark,
Quoted 4 lines · Mark Brown
There is a move to deprecate bus-specific PM operations and move to using
dev_pm_opsinstead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the WM831x SPI driver.
Patch applied, thanks a lot.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/