aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/pxa2xx_spi.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2008-02-06 04:38:21 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:11 -0500
commit5beec4aa2ac261b0b4992fb41df40a7ab91e4fad (patch)
tree98585b3c1e07a23e6ff82cc4df0f3479a0098527 /drivers/spi/pxa2xx_spi.c
parent26fdc1f0df22dd14fd4161ccb2fad94a3a938c48 (diff)
spi: remove more dev->power.power_state usage
Remove some more references to dev->power.power_state. That field is overdue for removal, but we can't do that while it's still referenced in the kernel. The only reason to update it was to make the /sys/devices/.../power/state files (now removed) work better. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
-rw-r--r--drivers/spi/pxa2xx_spi.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index eb817b8eb024..365e0e355aea 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1526,17 +1526,6 @@ static void pxa2xx_spi_shutdown(struct platform_device *pdev)
1526} 1526}
1527 1527
1528#ifdef CONFIG_PM 1528#ifdef CONFIG_PM
1529static int suspend_devices(struct device *dev, void *pm_message)
1530{
1531 pm_message_t *state = pm_message;
1532
1533 if (dev->power.power_state.event != state->event) {
1534 dev_warn(dev, "pm state does not match request\n");
1535 return -1;
1536 }
1537
1538 return 0;
1539}
1540 1529
1541static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state) 1530static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state)
1542{ 1531{
@@ -1544,12 +1533,6 @@ static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state)
1544 struct ssp_device *ssp = drv_data->ssp; 1533 struct ssp_device *ssp = drv_data->ssp;
1545 int status = 0; 1534 int status = 0;
1546 1535
1547 /* Check all childern for current power state */
1548 if (device_for_each_child(&pdev->dev, &state, suspend_devices) != 0) {
1549 dev_warn(&pdev->dev, "suspend aborted\n");
1550 return -1;
1551 }
1552
1553 status = stop_queue(drv_data); 1536 status = stop_queue(drv_data);
1554 if (status != 0) 1537 if (status != 0)
1555 return status; 1538 return status;