Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5beec4aa authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26fdc1f0

drivers/spi/pxa2xx_spi.c

+0 −17
Original line number Diff line number Diff line
@@ -1526,17 +1526,6 @@ 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)

{
@@ -1544,12 +1533,6 @@ static int pxa2xx_spi_suspend(struct platform_device *pdev, pm_message_t state) 
	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;

drivers/spi/spi_imx.c

+0 −11
Original line number Diff line number Diff line
@@ -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)

{