From: Omar Ramirez Luna <omar.ramirez@ti.com>
To: l-o <linux-omap@vger.kernel.org>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>,
Fernando Guzman Lugo <fernando.lugo@ti.com>,
Armando Uribe <x0095078@ti.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 7/8] staging: tidspbridge: remove redundant indentation in PM routines
Date: Wed, 23 Mar 2011 12:49:52 -0600 [thread overview]
Message-ID: <1300906193-1732-8-git-send-email-omar.ramirez@ti.com> (raw)
In-Reply-To: <1300906193-1732-1-git-send-email-omar.ramirez@ti.com>
Trivial cleaunp to remove redundant indentation.
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 87 ++++++++++-----------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index cb2a873..95089ef 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -104,36 +104,31 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context)
if (!t) {
pr_err("%s: Timed out waiting for DSP off mode\n", __func__);
return -ETIMEDOUT;
- } else {
+ }
- /* Save mailbox settings */
- omap_mbox_save_ctx(dev_context->mbox);
+ /* Save mailbox settings */
+ omap_mbox_save_ctx(dev_context->mbox);
- /* Turn off DSP Peripheral clocks and DSP Load monitor timer */
- status = dsp_clock_disable_all(dev_context->dsp_per_clks);
+ /* Turn off DSP Peripheral clocks and DSP Load monitor timer */
+ status = dsp_clock_disable_all(dev_context->dsp_per_clks);
+ if (status)
+ return status;
- /* Disable wdt on hibernation. */
- dsp_wdt_enable(false);
+ /* Disable wdt on hibernation. */
+ dsp_wdt_enable(false);
- if (!status) {
- /* Update the Bridger Driver state */
- dev_context->brd_state = BRD_DSP_HIBERNATION;
+ /* Update the Bridger Driver state */
+ dev_context->brd_state = BRD_DSP_HIBERNATION;
#ifdef CONFIG_TIDSPBRIDGE_DVFS
- status =
- dev_get_io_mgr(dev_context->dev_obj, &hio_mgr);
- if (!hio_mgr)
- return -EINVAL;
- io_sh_msetting(hio_mgr, SHM_GETOPP, &opplevel);
-
- /*
- * Set the OPP to low level before moving to OFF
- * mode
- */
- if (pdata->dsp_set_min_opp)
- (*pdata->dsp_set_min_opp) (VDD1_OPP1);
+ status = dev_get_io_mgr(dev_context->dev_obj, &hio_mgr);
+ if (!hio_mgr)
+ return -EINVAL;
+ io_sh_msetting(hio_mgr, SHM_GETOPP, &opplevel);
+
+ /* Set the OPP to low level before moving to OFF mode */
+ if (pdata->dsp_set_min_opp)
+ (*pdata->dsp_set_min_opp) (VDD1_OPP1);
#endif /* CONFIG_TIDSPBRIDGE_DVFS */
- }
- }
#endif
return status;
}
@@ -218,30 +213,30 @@ int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd,
bridge_deh_notify(hdeh_mgr, DSP_PWRERROR, 0);
#endif /* CONFIG_TIDSPBRIDGE_NTFY_PWRERR */
return -ETIMEDOUT;
- } else {
- /* Update the Bridger Driver state */
- if (dsp_test_sleepstate == PWRDM_POWER_OFF)
- dev_context->brd_state = BRD_HIBERNATION;
- else
- dev_context->brd_state = BRD_RETENTION;
-
- /* Disable wdt on hibernation. */
- dsp_wdt_enable(false);
-
- /* Turn off DSP Peripheral clocks */
- status = dsp_clock_disable_all(dev_context->dsp_per_clks);
- if (status)
- return status;
+ }
+
+ /* Update the Bridger Driver state */
+ if (dsp_test_sleepstate == PWRDM_POWER_OFF)
+ dev_context->brd_state = BRD_HIBERNATION;
+ else
+ dev_context->brd_state = BRD_RETENTION;
+
+ /* Disable wdt on hibernation. */
+ dsp_wdt_enable(false);
+
+ /* Turn off DSP Peripheral clocks */
+ status = dsp_clock_disable_all(dev_context->dsp_per_clks);
+ if (status)
+ return status;
#ifdef CONFIG_TIDSPBRIDGE_DVFS
- else if (target_pwr_state == PWRDM_POWER_OFF) {
- /*
- * Set the OPP to low level before moving to OFF mode
- */
- if (pdata->dsp_set_min_opp)
- (*pdata->dsp_set_min_opp) (VDD1_OPP1);
- }
-#endif /* CONFIG_TIDSPBRIDGE_DVFS */
+ if (target_pwr_state == PWRDM_POWER_OFF) {
+ /*
+ * Set the OPP to low level before moving to OFF mode
+ */
+ if (pdata->dsp_set_min_opp)
+ (*pdata->dsp_set_min_opp) (VDD1_OPP1);
}
+#endif /* CONFIG_TIDSPBRIDGE_DVFS */
#endif /* CONFIG_PM */
return status;
}
--
1.7.1
next prev parent reply other threads:[~2011-03-23 19:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 18:49 [PATCH 0/8] staging: tidspbridge: PM routines cleanup Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 1/8] staging: tidspbridge: make wake_dsp to handle PM code Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 2/8] staging: tidspbridge: fix resume path from retention Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 3/8] staging: tidspbridge: remove msleep for dsp transition wait Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 4/8] staging: tidspbridge: send mbox PM command directly Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 5/8] staging: tidspbridge: send wake message even if dsp is running Omar Ramirez Luna
2011-03-23 18:49 ` [PATCH 6/8] staging: tidspbridge: remove redundant code from PM routines Omar Ramirez Luna
2011-03-23 18:49 ` Omar Ramirez Luna [this message]
2011-03-23 18:49 ` [PATCH 8/8] staging: tidspbridge: protect critical sections on " Omar Ramirez Luna
2011-04-29 19:20 ` [PATCH 0/8] staging: tidspbridge: PM routines cleanup Ramirez Luna, Omar
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=1300906193-1732-8-git-send-email-omar.ramirez@ti.com \
--to=omar.ramirez@ti.com \
--cc=felipe.contreras@gmail.com \
--cc=fernando.lugo@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=x0095078@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).