From: Johannes Berg <johannes@sipsolutions.net>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>
Subject: [PATCH/RFC] via-pmu: remove mdelays from suspend/resume code
Date: Thu, 03 Apr 2008 17:44:44 +0200 [thread overview]
Message-ID: <1207237484.3797.2.camel@johannes.berg> (raw)
I don't see a reason for either of those mdelay()s, is there any? Works
fine for me without them...
johannes
---
drivers/macintosh/via-pmu.c | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
--- everything.orig/drivers/macintosh/via-pmu.c 2008-04-03 17:27:29.000000000 +0200
+++ everything/drivers/macintosh/via-pmu.c 2008-04-03 17:28:23.000000000 +0200
@@ -2165,8 +2165,6 @@ static void pmac_suspend_disable_irqs(vo
static int powerbook_sleep(suspend_state_t state)
{
- int error = 0;
-
/* Wait for completion of async requests */
while (!batt_req.complete)
pmu_poll();
@@ -2183,25 +2181,15 @@ static int powerbook_sleep(suspend_state
switch (pmu_kind) {
case PMU_OHARE_BASED:
- error = powerbook_sleep_3400();
- break;
+ return powerbook_sleep_3400();
case PMU_HEATHROW_BASED:
case PMU_PADDINGTON_BASED:
- error = powerbook_sleep_grackle();
- break;
+ return powerbook_sleep_grackle();
case PMU_KEYLARGO_BASED:
- error = powerbook_sleep_Core99();
- break;
+ return powerbook_sleep_Core99();
default:
return -ENOSYS;
}
-
- if (error)
- return error;
-
- mdelay(100);
-
- return 0;
}
static void pmac_suspend_enable_irqs(void)
@@ -2210,8 +2198,6 @@ static void pmac_suspend_enable_irqs(voi
adb_int_pending = 1;
via_pmu_interrupt(0, NULL);
- mdelay(10);
-
/* Call platform functions marked "on wake" */
pmac_pfunc_base_resume();
pmac_pfunc_i2c_resume();
next reply other threads:[~2008-04-04 14:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-03 15:44 Johannes Berg [this message]
2008-04-04 17:20 ` [PATCH/RFC] via-pmu: remove mdelays from suspend/resume code Brad Boyer
2008-04-04 19:21 ` Johannes Berg
2008-04-04 21:16 ` Benjamin Herrenschmidt
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=1207237484.3797.2.camel@johannes.berg \
--to=johannes@sipsolutions.net \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/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).