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

Commit 3b98aeaf authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

PM: don't skip device PM init when CONFIG_PM_SLEEP isn't set and CONFIG_PM is set 



This patch (as1124) fixes a couple of bugs in the PM core.  The new
dev->power.status field should be initialized regardless of whether
CONFIG_PM_SLEEP is enabled, and similarly dpm_sysfs_add() should be
called whenever CONFIG_PM is enabled.

The patch separates out the call to dpm_sysfs_add() from the call to
device_pm_add().  As a result device_pm_add() can no longer return an
error, so its return type is changed to void.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarRomit Dasgupta <romit@ti.com>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7c225035

drivers/base/core.c

+6 −3
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ void device_initialize(struct device *dev) 
	spin_lock_init(&dev->devres_lock);

	INIT_LIST_HEAD(&dev->devres_head);

	device_init_wakeup(dev, 0);

	device_pm_init(dev);

	set_dev_node(dev, -1);

}
@@ -897,9 +898,10 @@ int device_add(struct device *dev) 
	error = bus_add_device(dev);

	if (error)

		goto BusError;

	error = device_pm_add(dev);

	error = dpm_sysfs_add(dev);

	if (error)

		goto PMError;

		goto DPMError;

	device_pm_add(dev);

	kobject_uevent(&dev->kobj, KOBJ_ADD);

	bus_attach_device(dev);

	if (parent)
@@ -920,7 +922,7 @@ int device_add(struct device *dev) 
 Done:

	put_device(dev);

	return error;

 PMError:

 DPMError:

	bus_remove_device(dev);

 BusError:

	if (dev->bus)
@@ -1007,6 +1009,7 @@ void device_del(struct device *dev) 
	struct class_interface *class_intf;



	device_pm_remove(dev);

	dpm_sysfs_remove(dev);

	if (parent)

		klist_del(&dev->knode_parent);

	if (MAJOR(dev->devt)) {

drivers/base/power/main.c

+3 −10
Original line number Diff line number Diff line
@@ -67,10 +67,8 @@ void device_pm_unlock(void) 
 *	device_pm_add - add a device to the list of active devices

 *	@dev:	Device to be added to the list

 */

int device_pm_add(struct device *dev)

void device_pm_add(struct device *dev)

{

	int error;



	pr_debug("PM: Adding info for %s:%s\n",

		 dev->bus ? dev->bus->name : "No Bus",

		 kobject_name(&dev->kobj));
@@ -89,13 +87,9 @@ int device_pm_add(struct device *dev) 
		 */

		WARN_ON(true);

	}

	error = dpm_sysfs_add(dev);

	if (!error) {

		dev->power.status = DPM_ON;



	list_add_tail(&dev->power.entry, &dpm_list);

	}

	mutex_unlock(&dpm_list_mtx);

	return error;

}



/**
@@ -110,7 +104,6 @@ void device_pm_remove(struct device *dev) 
		 dev->bus ? dev->bus->name : "No Bus",

		 kobject_name(&dev->kobj));

	mutex_lock(&dpm_list_mtx);

	dpm_sysfs_remove(dev);

	list_del_init(&dev->power.entry);

	mutex_unlock(&dpm_list_mtx);

}

drivers/base/power/power.h

+7 −2
Original line number Diff line number Diff line 
static inline void device_pm_init(struct device *dev)

{

	dev->power.status = DPM_ON;

}



#ifdef CONFIG_PM_SLEEP



/*
@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry) 
	return container_of(entry, struct device, power.entry);

}



extern int device_pm_add(struct device *);

extern void device_pm_add(struct device *);

extern void device_pm_remove(struct device *);



#else /* CONFIG_PM_SLEEP */



static inline int device_pm_add(struct device *dev) { return 0; }

static inline void device_pm_add(struct device *dev) {}

static inline void device_pm_remove(struct device *dev) {}



#endif