From: b-cousson@ti•com (Cousson, Benoit)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 05/21] Revert "OMAP3+: PM: SR: add suspend/resume handlers"
Date: Wed, 25 Jan 2012 18:53:53 +0100 [thread overview]
Message-ID: <4F2041B1.6060907@ti.com> (raw)
In-Reply-To: <1327504583-13408-6-git-send-email-j-pihet@ti.com>
Salut Jean,
On 1/25/2012 4:16 PM, Jean Pihet wrote:
> From: Nishanth Menon<nm@ti•com>
>
> This reverts commit b6be18f0bab68ed304ebbb2d787d1c36237eda62.
That weird, because you revert a patch you introduced just before:
[PATCH 03/21] OMAP3+: PM: SR: add suspend/resume handlers
Moreover this commit id is not relevant since it is probably only in
Nishanth's GIT tree.
> Revert the patch so that we remove any opportunity of SR disable/enable
> and any device_scale transitions from conflicting with suspend/resume
> path by moving the sr enable/disable activity to the very last
> stage(in pmxx.C). The previous patch tried to optimize suspend resume
> time, but since device_scale opportunities are from multiple drivers
> (other than cpufreq), hence reverting back to original approach
>
> Conflicts:
>
> arch/arm/mach-omap2/smartreflex.c
>
> Change-Id: I236b0e8259cfb371899dd0c93875739a21358e33
And this looks like gerrit leftover that should not be there.
I guess that path #3 and #5 should just be removed.
Regards,
Benoit
> Signed-off-by: Nishanth Menon<nm@ti•com>
> Signed-off-by: Jean Pihet<j-pihet@ti•com>
> ---
> arch/arm/mach-omap2/smartreflex.c | 90 -------------------------------------
> 1 files changed, 0 insertions(+), 90 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
> index 95fd228..7e755bb 100644
> --- a/arch/arm/mach-omap2/smartreflex.c
> +++ b/arch/arm/mach-omap2/smartreflex.c
> @@ -24,7 +24,6 @@
> #include<linux/debugfs.h>
> #include<linux/delay.h>
> #include<linux/slab.h>
> -#include<linux/pm.h>
> #include<linux/pm_runtime.h>
>
> #include "common.h"
> @@ -41,7 +40,6 @@ struct omap_sr {
> int ip_type;
> int nvalue_count;
> bool autocomp_active;
> - bool is_suspended;
> u32 clk_length;
> u32 err_weight;
> u32 err_minlimit;
> @@ -687,11 +685,6 @@ void omap_sr_enable(struct voltagedomain *voltdm)
> if (!sr->autocomp_active)
> return;
>
> - if (sr->is_suspended) {
> - dev_dbg(&sr->pdev->dev, "%s: in suspended state\n", __func__);
> - return;
> - }
> -
> if (!sr_class || !(sr_class->enable) || !(sr_class->configure)) {
> dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not"
> "registered\n", __func__);
> @@ -725,11 +718,6 @@ void omap_sr_disable(struct voltagedomain *voltdm)
> if (!sr->autocomp_active)
> return;
>
> - if (sr->is_suspended) {
> - dev_dbg(&sr->pdev->dev, "%s: in suspended state\n", __func__);
> - return;
> - }
> -
> if (!sr_class || !(sr_class->disable)) {
> dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not"
> "registered\n", __func__);
> @@ -763,11 +751,6 @@ void omap_sr_disable_reset_volt(struct voltagedomain *voltdm)
> if (!sr->autocomp_active)
> return;
>
> - if (sr->is_suspended) {
> - dev_dbg(&sr->pdev->dev, "%s: in suspended state\n", __func__);
> - return;
> - }
> -
> if (!sr_class || !(sr_class->disable)) {
> dev_warn(&sr->pdev->dev, "%s: smartreflex class driver not"
> "registered\n", __func__);
> @@ -826,11 +809,6 @@ static int omap_sr_autocomp_store(void *data, u64 val)
> return -EINVAL;
> }
>
> - if (sr_info->is_suspended) {
> - pr_warning("%s: in suspended state\n", __func__);
> - return -EBUSY;
> - }
> -
> /* control enable/disable only if there is a delta in value */
> if (sr_info->autocomp_active != val) {
> if (!val)
> @@ -1033,78 +1011,10 @@ static int __devexit omap_sr_remove(struct platform_device *pdev)
> return 0;
> }
>
> -static int omap_sr_suspend(struct device *dev)
> -{
> - struct omap_sr_data *pdata;
> - struct omap_sr *sr_info;
> -
> - pdata = dev_get_platdata(dev);
> - if (!pdata) {
> - dev_err(dev, "%s: platform data missing\n", __func__);
> - return -EINVAL;
> - }
> -
> - sr_info = _sr_lookup(pdata->voltdm);
> - if (IS_ERR(sr_info)) {
> - dev_warn(dev, "%s: omap_sr struct not found\n", __func__);
> - return -EINVAL;
> - }
> -
> - if (!sr_info->autocomp_active)
> - return 0;
> -
> - if (sr_info->is_suspended)
> - return 0;
> -
> - omap_sr_disable_reset_volt(pdata->voltdm);
> - sr_info->is_suspended = true;
> - /* Flag the same info to the other CPUs */
> - smp_wmb();
> -
> - return 0;
> -}
> -
> -static int omap_sr_resume(struct device *dev)
> -{
> - struct omap_sr_data *pdata;
> - struct omap_sr *sr_info;
> -
> - pdata = dev_get_platdata(dev);
> - if (!pdata) {
> - dev_err(dev, "%s: platform data missing\n", __func__);
> - return -EINVAL;
> - }
> -
> - sr_info = _sr_lookup(pdata->voltdm);
> - if (IS_ERR(sr_info)) {
> - dev_warn(dev, "%s: omap_sr struct not found\n", __func__);
> - return -EINVAL;
> - }
> -
> - if (!sr_info->autocomp_active)
> - return 0;
> -
> - if (!sr_info->is_suspended)
> - return 0;
> -
> - sr_info->is_suspended = false;
> - /* Flag the same info to the other CPUs */
> - smp_wmb();
> - omap_sr_enable(pdata->voltdm);
> -
> - return 0;
> -}
> -
> -const static struct dev_pm_ops omap_sr_dev_pm_ops = {
> - .suspend_noirq = omap_sr_suspend,
> - .resume_noirq = omap_sr_resume,
> -};
> -
> static struct platform_driver smartreflex_driver = {
> .remove = omap_sr_remove,
> .driver = {
> .name = "smartreflex",
> - .pm =&omap_sr_dev_pm_ops,
> },
> };
>
next prev parent reply other threads:[~2012-01-25 17:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 15:16 [PATCH 00/21] OMAP3+: SR: bugfixes Jean Pihet
2012-01-25 15:16 ` [PATCH 01/21] OMAP3+: SR Layer Cleanup [V4] Jean Pihet
2012-01-25 15:16 ` [PATCH 02/21] arch/arm/mach-omap2/smartreflex.c: add missing error-handling code Jean Pihet
2012-01-25 15:16 ` [PATCH 03/21] OMAP3+: PM: SR: add suspend/resume handlers Jean Pihet
2012-01-25 15:16 ` [PATCH 04/21] ARM: omap2+: smartreflex: move smartreflex suspend to suspend_noirq Jean Pihet
2012-01-25 18:29 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 05/21] Revert "OMAP3+: PM: SR: add suspend/resume handlers" Jean Pihet
2012-01-25 17:53 ` Cousson, Benoit [this message]
2012-01-25 18:13 ` Jean Pihet
2012-01-25 18:25 ` Cousson, Benoit
2012-01-25 18:49 ` Kevin Hilman
2012-01-25 21:29 ` Menon, Nishanth
2012-01-26 7:31 ` Jean Pihet
2012-01-25 15:16 ` [PATCH 06/21] OMAP3+: Smartreflex: fix err interrupt disable sequence Jean Pihet
2012-01-25 15:16 ` [PATCH 07/21] OMAP3+: PM: SR/Class3: disable errorgen before disable VP Jean Pihet
2012-01-26 11:26 ` Sergei Shtylyov
2012-01-31 10:06 ` Jean Pihet
2012-01-31 11:37 ` Sergei Shtylyov
2012-01-31 13:39 ` Jean Pihet
2012-01-25 15:16 ` [PATCH 08/21] OMAP3+: Smartreflex: Add a shutdown hook Jean Pihet
2012-01-26 11:21 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 09/21] OMAP3+: Smartreflex: Fix status masking in ERRCONFIG register Jean Pihet
2012-01-26 11:28 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 10/21] OMAP3+: Smartreflex: clear ERRCONFIG_VPBOUNDINTST only on a need Jean Pihet
2012-01-26 11:29 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 11/21] OMAP3: hwmod: add SmartReflex IRQs Jean Pihet
2012-01-26 11:30 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 12/21] OMAP3+: SR: introduce class init,deinit and priv data Jean Pihet
2012-01-26 11:31 ` Sergei Shtylyov
2012-01-25 15:16 ` [PATCH 13/21] OMAP3+: SR: introduce notifiers flags Jean Pihet
2012-01-25 15:16 ` [PATCH 14/21] OMAP3+: SR: introduce notifier_control Jean Pihet
2012-01-25 15:16 ` [PATCH 15/21] OMAP3+: SR: disable spamming interrupts Jean Pihet
2012-01-25 15:16 ` [PATCH 16/21] OMAP3+: SR: introduce class private data per voltage domain Jean Pihet
2012-01-25 15:16 ` [PATCH 17/21] OMAP3430: SR: class3: restrict CPU to run on Jean Pihet
2012-01-26 11:33 ` Sergei Shtylyov
2012-01-26 12:22 ` Jean Pihet
2012-01-25 15:16 ` [PATCH 18/21] arm: omap: smartreflex: add missing platform_set_drvdata() Jean Pihet
2012-01-25 15:16 ` [PATCH 19/21] arm: omap: smartreflex: move late_initcall() closer to its argument Jean Pihet
2012-01-25 15:16 ` [PATCH 20/21] arm: omap: smartreflex: clean ups all over Jean Pihet
2012-01-25 15:16 ` [PATCH 21/21] arm: omap: smartreflex: micro-optimization for sanity check Jean Pihet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F2041B1.6060907@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox