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

Commit 1e95e3b2 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM: Convert dev_pm_put_subsys_data() into a void function 



Clients using the dev_pm_put_subsys_data() API isn't interested of a
return value. They care only of decreasing a reference to the device's
pm_subsys_data. So, let's convert the API to a void function, which
anyway seems like reasonable thing to do.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 766bb53c

drivers/base/power/common.c

+4 −10
Original line number Diff line number Diff line
@@ -56,13 +56,11 @@ EXPORT_SYMBOL_GPL(dev_pm_get_subsys_data); 
 * @dev: Device to handle.

 *

 * If the reference counter of power.subsys_data is zero after dropping the

 * reference, power.subsys_data is removed.  Return 1 if that happens or 0

 * otherwise.

 * reference, power.subsys_data is removed.

 */

int dev_pm_put_subsys_data(struct device *dev)

void dev_pm_put_subsys_data(struct device *dev)

{

	struct pm_subsys_data *psd;

	int ret = 1;



	spin_lock_irq(&dev->power.lock);
@@ -70,18 +68,14 @@ int dev_pm_put_subsys_data(struct device *dev) 
	if (!psd)

		goto out;



	if (--psd->refcount == 0) {

	if (--psd->refcount == 0)

		dev->power.subsys_data = NULL;

	} else {

	else

		psd = NULL;

		ret = 0;

	}



 out:

	spin_unlock_irq(&dev->power.lock);

	kfree(psd);



	return ret;

}

EXPORT_SYMBOL_GPL(dev_pm_put_subsys_data);

include/linux/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ struct dev_pm_info { 


extern void update_pm_runtime_accounting(struct device *dev);

extern int dev_pm_get_subsys_data(struct device *dev);

extern int dev_pm_put_subsys_data(struct device *dev);

extern void dev_pm_put_subsys_data(struct device *dev);



/*

 * Power domains provide callbacks that are executed during system suspend,