Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83502
b: refs/heads/master
c: 5beec4a
h: refs/heads/master
v: v3
  • Loading branch information
David Brownell authored and Linus Torvalds committed Feb 6, 2008
1 parent 751d515 commit 6951cf0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26fdc1f0df22dd14fd4161ccb2fad94a3a938c48
refs/heads/master: 5beec4aa2ac261b0b4992fb41df40a7ab91e4fad
17 changes: 0 additions & 17 deletions trunk/drivers/spi/pxa2xx_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1526,30 +1526,13 @@ static void pxa2xx_spi_shutdown(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int suspend_devices(struct device *dev, void *pm_message)
{
pm_message_t *state = pm_message;

if (dev->power.power_state.event != state->event) {
dev_warn(dev, "pm state does not match request\n");
return -1;
}

return 0;
}

static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state)
{
struct driver_data *drv_data = platform_get_drvdata(pdev);
struct ssp_device *ssp = drv_data->ssp;
int status = 0;

/* Check all childern for current power state */
if (device_for_each_child(&pdev->dev, &state, suspend_devices) != 0) {
dev_warn(&pdev->dev, "suspend aborted\n");
return -1;
}

status = stop_queue(drv_data);
if (status != 0)
return status;
Expand Down
11 changes: 0 additions & 11 deletions trunk/drivers/spi/spi_imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1686,17 +1686,6 @@ static void spi_imx_shutdown(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int suspend_devices(struct device *dev, void *pm_message)
{
pm_message_t *state = pm_message;

if (dev->power.power_state.event != state->event) {
dev_warn(dev, "pm state does not match request\n");
return -1;
}

return 0;
}

static int spi_imx_suspend(struct platform_device *pdev, pm_message_t state)
{
Expand Down

0 comments on commit 6951cf0

Please sign in to comment.