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

Commit 3c72426f authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

spi core: stop updating dev->power.power_state 



Don't update dev->power.power_state any more in the SPI core.  The only
reason to update this scheduled-to-be-removed field was to make the
already-removed /sys/devices/.../power/state files 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 5ceadd2a

drivers/spi/spi.c

+14 −20
Original line number Diff line number Diff line
@@ -76,39 +76,33 @@ static int spi_uevent(struct device *dev, struct kobj_uevent_env *env) 


#ifdef	CONFIG_PM



/*

 * NOTE:  the suspend() method for an spi_master controller driver

 * should verify that all its child devices are marked as suspended;

 * suspend requests delivered through sysfs power/state files don't

 * enforce such constraints.

 */

static int spi_suspend(struct device *dev, pm_message_t message)

{

	int			value;

	int			value = 0;

	struct spi_driver	*drv = to_spi_driver(dev->driver);



	if (!drv || !drv->suspend)

		return 0;



	/* suspend will stop irqs and dma; no more i/o */

	if (drv) {

		if (drv->suspend)

			value = drv->suspend(to_spi_device(dev), message);

	if (value == 0)

		dev->power.power_state = message;

		else

			dev_dbg(dev, "... can't suspend\n");

	}

	return value;

}



static int spi_resume(struct device *dev)

{

	int			value;

	int			value = 0;

	struct spi_driver	*drv = to_spi_driver(dev->driver);



	if (!drv || !drv->resume)

		return 0;



	/* resume may restart the i/o queue */

	if (drv) {

		if (drv->resume)

			value = drv->resume(to_spi_device(dev));

	if (value == 0)

		dev->power.power_state = PMSG_ON;

		else

			dev_dbg(dev, "... can't resume\n");

	}

	return value;

}