Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936426Ab3DRTC4 (ORCPT ); Thu, 18 Apr 2013 15:02:56 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:56745 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750958Ab3DRTCy (ORCPT ); Thu, 18 Apr 2013 15:02:54 -0400 Message-ID: <5170434C.7040706@ti.com> Date: Fri, 19 Apr 2013 00:32:36 +0530 From: Sourav Poddar User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: Kevin Hilman CC: , , , , , Subject: Re: [PATCH 4/6] arm: mach-omap2: remove "OMAP_DEVICE_NO_IDLE_ON_SUSPEND" check References: <1366198467-6757-1-git-send-email-sourav.poddar@ti.com> <1366198467-6757-5-git-send-email-sourav.poddar@ti.com> <87li8f4sum.fsf@linaro.org> In-Reply-To: <87li8f4sum.fsf@linaro.org> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2586 Lines: 65 On Thursday 18 April 2013 11:35 PM, Kevin Hilman wrote: > Sourav Poddar writes: > >> Remove the "OMAP_DEVICE_NO_IDLE_ON_SUSPEND" check, since UART was the only one making >> use of it. Now serial core/driver takes care of the case when "no_console_suspend" >> is used in the bootargs and you need to keep the clock enable for console even while suspend. >> >> Signed-off-by: Sourav Poddar > NAK. This patch will break many things... > >> --- >> arch/arm/mach-omap2/omap_device.c | 7 +------ >> 1 files changed, 1 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c >> index 381be7a..d6dce8f 100644 >> --- a/arch/arm/mach-omap2/omap_device.c >> +++ b/arch/arm/mach-omap2/omap_device.c >> @@ -620,11 +620,8 @@ static int _od_suspend_noirq(struct device *dev) >> ret = pm_generic_suspend_noirq(dev); >> >> if (!ret&& !pm_runtime_status_suspended(dev)) { >> - if (pm_generic_runtime_suspend(dev) == 0) { >> - if (!(od->flags& OMAP_DEVICE_NO_IDLE_ON_SUSPEND)) >> - omap_device_idle(pdev); > Why did you remove the omap_device_idle() here? This patch is used along with patch3 to get rid of the issue. I posted them as a seperate patch beacuse of the subject line as one goes under drivers/* and the other arm/mach-omap2/*.. This check was only valid for UART, and if od->flags is set to the "OMAP_DEVICE_NO_IDLE_ON_SUSPEND" flag, then UART will not be idled. But now, we no longer depend on od->flag value to prevent idling of our console UART as the prepare/complete apis will take care of them. >> + if (pm_generic_runtime_suspend(dev) == 0) >> od->flags |= OMAP_DEVICE_SUSPENDED; >> - } >> } >> >> return ret; >> @@ -638,8 +635,6 @@ static int _od_resume_noirq(struct device *dev) >> if ((od->flags& OMAP_DEVICE_SUSPENDED)&& >> !pm_runtime_status_suspended(dev)) { >> od->flags&= ~OMAP_DEVICE_SUSPENDED; >> - if (!(od->flags& OMAP_DEVICE_NO_IDLE_ON_SUSPEND)) >> - omap_device_enable(pdev); > And the _enable() here? > >> pm_generic_runtime_resume(dev); >> } > Note that the check is for when the flag is *not* set, so this patch > changes behavior for all the drivers that do not use > _NO_IDLE_ON_SUSPEND. I think that's the opposite of what you intended. > > Kevin -- 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/