aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/pxa2xx_spi.c17
-rw-r--r--drivers/spi/spi_imx.c11
2 files changed, 0 insertions, 28 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;
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 639963eb1ac1..1b0647124933 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1686,17 +1686,6 @@ static void spi_imx_shutdown(struct platform_device *pdev)
1686} 1686}
1687 1687
1688#ifdef CONFIG_PM 1688#ifdef CONFIG_PM
1689static int suspend_devices(struct device *dev, void *pm_message)
1690{
1691 pm_message_t *state = pm_message;
1692
1693 if (dev->power.power_state.event != state->event) {
1694 dev_warn(dev, "pm state does not match request\n");
1695 return -1;
1696 }
1697
1698 return 0;
1699}
1700 1689
1701static int spi_imx_suspend(struct platform_device *pdev, pm_message_t state) 1690static int spi_imx_suspend(struct platform_device *pdev, pm_message_t state)
1702{ 1691{