Commit 68313be4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier system-wide PM changes for 6.10.

parents 3c89a068 5b9eda2b

drivers/base/power/main.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static ktime_t initcall_debug_start(struct device *dev, void *cb) 
	if (!pm_print_times_enabled)

		return 0;



	dev_info(dev, "calling %pS @ %i, parent: %s\n", cb,

	dev_info(dev, "calling %ps @ %i, parent: %s\n", cb,

		 task_pid_nr(current),

		 dev->parent ? dev_name(dev->parent) : "none");

	return ktime_get();
@@ -223,7 +223,7 @@ static void initcall_debug_report(struct device *dev, ktime_t calltime, 
		return;



	rettime = ktime_get();

	dev_info(dev, "%pS returned %d after %Ld usecs\n", cb, error,

	dev_info(dev, "%ps returned %d after %Ld usecs\n", cb, error,

		 (unsigned long long)ktime_us_delta(rettime, calltime));

}
@@ -1927,7 +1927,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start); 
void __suspend_report_result(const char *function, struct device *dev, void *fn, int ret)

{

	if (ret)

		dev_err(dev, "%s(): %pS returns %d\n", function, fn, ret);

		dev_err(dev, "%s(): %ps returns %d\n", function, fn, ret);

}

EXPORT_SYMBOL_GPL(__suspend_report_result);

drivers/base/power/wakeup.c

+7 −4
Original line number Diff line number Diff line
@@ -451,16 +451,15 @@ static struct wakeup_source *device_wakeup_detach(struct device *dev) 
 * Detach the @dev's wakeup source object from it, unregister this wakeup source

 * object and destroy it.

 */

int device_wakeup_disable(struct device *dev)

void device_wakeup_disable(struct device *dev)

{

	struct wakeup_source *ws;



	if (!dev || !dev->power.can_wakeup)

		return -EINVAL;

		return;



	ws = device_wakeup_detach(dev);

	wakeup_source_unregister(ws);

	return 0;

}

EXPORT_SYMBOL_GPL(device_wakeup_disable);
@@ -502,7 +501,11 @@ EXPORT_SYMBOL_GPL(device_set_wakeup_capable); 
 */

int device_set_wakeup_enable(struct device *dev, bool enable)

{

	return enable ? device_wakeup_enable(dev) : device_wakeup_disable(dev);

	if (enable)

		return device_wakeup_enable(dev);



	device_wakeup_disable(dev);

	return 0;

}

EXPORT_SYMBOL_GPL(device_set_wakeup_enable);

drivers/mmc/host/sdhci-pci-core.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int sdhci_pci_init_wakeup(struct sdhci_pci_chip *chip) 
	if ((pm_flags & MMC_PM_KEEP_POWER) && (pm_flags & MMC_PM_WAKE_SDIO_IRQ))

		return device_wakeup_enable(&chip->pdev->dev);

	else if (!cap_cd_wake)

		return device_wakeup_disable(&chip->pdev->dev);

		device_wakeup_disable(&chip->pdev->dev);



	return 0;

}

include/linux/pm_wakeup.h

+5 −7
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern void wakeup_sources_read_unlock(int idx); 
extern struct wakeup_source *wakeup_sources_walk_start(void);

extern struct wakeup_source *wakeup_sources_walk_next(struct wakeup_source *ws);

extern int device_wakeup_enable(struct device *dev);

extern int device_wakeup_disable(struct device *dev);

extern void device_wakeup_disable(struct device *dev);

extern void device_set_wakeup_capable(struct device *dev, bool capable);

extern int device_set_wakeup_enable(struct device *dev, bool enable);

extern void __pm_stay_awake(struct wakeup_source *ws);
@@ -154,10 +154,9 @@ static inline int device_wakeup_enable(struct device *dev) 
	return 0;

}



static inline int device_wakeup_disable(struct device *dev)

static inline void device_wakeup_disable(struct device *dev)

{

	dev->power.should_wakeup = false;

	return 0;

}



static inline int device_set_wakeup_enable(struct device *dev, bool enable)
@@ -235,11 +234,10 @@ static inline int device_init_wakeup(struct device *dev, bool enable) 
	if (enable) {

		device_set_wakeup_capable(dev, true);

		return device_wakeup_enable(dev);

	} else {

	}

	device_wakeup_disable(dev);

	device_set_wakeup_capable(dev, false);

	return 0;

}

}



#endif /* _LINUX_PM_WAKEUP_H */