Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752679AbbGOMol (ORCPT ); Wed, 15 Jul 2015 08:44:41 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:36384 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752216AbbGOMoK (ORCPT ); Wed, 15 Jul 2015 08:44:10 -0400 From: Tomeu Vizoso To: linux-pm@vger.kernel.org, Alan Stern , "Rafael J. Wysocki" Cc: Tomeu Vizoso , linux-kernel@vger.kernel.org, Len Brown , Greg Kroah-Hartman , Pavel Machek Subject: [PATCH v4 2/3] PM / sleep: Go direct_complete if driver has no callbacks Date: Wed, 15 Jul 2015 14:40:07 +0200 Message-Id: <1436964008-15151-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1436964008-15151-1-git-send-email-tomeu.vizoso@collabora.com> References: <1436964008-15151-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1766 Lines: 57 If a suitable prepare callback cannot be found for a given device and its driver has no PM callbacks at all, assume that it can go direct to complete when the system goes to sleep. The reason for this is that there's lots of devices in a system that do no PM at all and there's no reason for them to prevent their ancestors to do direct_complete if they can support it. Signed-off-by: Tomeu Vizoso --- drivers/base/power/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 1710c26ba097..edda3f233c7c 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1540,6 +1540,21 @@ int dpm_suspend(pm_message_t state) return error; } +static bool driver_has_no_pm_callbacks(struct device_driver *drv) +{ + if (!drv->pm) + return true; + + return !drv->pm->prepare && + !drv->pm->suspend && + !drv->pm->suspend_late && + !drv->pm->suspend_noirq && + !drv->pm->resume_noirq && + !drv->pm->resume_early && + !drv->pm->resume && + !drv->pm->complete; +} + /** * device_prepare - Prepare a device for system power transition. * @dev: Device to handle. @@ -1590,6 +1605,8 @@ static int device_prepare(struct device *dev, pm_message_t state) if (callback) ret = callback(dev); + else if (!dev->driver || driver_has_no_pm_callbacks(dev->driver)) + ret = 1; /* Let device go direct_complete */ device_unlock(dev); -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/