Skip to content

Commit

Permalink
spi: remove more dev->power.power_state usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Brownell authored and Linus Torvalds committed Feb 6, 2008
1 parent 26fdc1f commit 5beec4a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
17 changes: 0 additions & 17 deletions 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 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 5beec4a

Please sign in to comment.