From: Paul Mackerras <paulus@samba.org>
To: akpm@osdl.org
Cc: benh@kernel.crashing.org,
Russell King <rmk+lkml@arm.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: [PATCH] Fix pmac_zilog.c so it compiles again
Date: Mon, 15 Nov 2004 13:39:51 +1100 [thread overview]
Message-ID: <16792.5879.951131.956305@cargo.ozlabs.ibm.com> (raw)
It seems that pmac_zilog.c got missed in the dev.power_state to
dev.power.power_state conversion. This patch makes that change, and
also fixes a problem where it would not compile if CONFIG_MAGIC_SYSRQ
was set but CONFIG_SERIAL_CORE_CONSOLE was not.
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff -urN linux-2.5/drivers/serial/pmac_zilog.c test-pmac/drivers/serial/pmac_zilog.c
--- linux-2.5/drivers/serial/pmac_zilog.c 2004-11-08 18:37:52.000000000 +1100
+++ test-pmac/drivers/serial/pmac_zilog.c 2004-11-15 10:05:35.000000000 +1100
@@ -273,7 +273,7 @@
uap->flags &= ~PMACZILOG_FLAG_BREAK;
}
-#ifdef CONFIG_MAGIC_SYSRQ
+#if defined(CONFIG_MAGIC_SYSRQ) && defined(CONFIG_SERIAL_CORE_CONSOLE)
#ifdef USE_CTRL_O_SYSRQ
/* Handle the SysRq ^O Hack */
if (ch == '\x0f') {
@@ -289,7 +289,7 @@
if (swallow)
goto next_char;
}
-#endif /* CONFIG_MAGIC_SYSRQ */
+#endif /* CONFIG_MAGIC_SYSRQ && CONFIG_SERIAL_CORE_CONSOLE */
/* A real serial line, record the character and status. */
if (drop)
@@ -1603,7 +1603,7 @@
return 0;
}
- if (pm_state == mdev->ofdev.dev.power_state || pm_state < 2)
+ if (pm_state == mdev->ofdev.dev.power.power_state || pm_state < 2)
return 0;
pmz_debug("suspend, switching to state %d\n", pm_state);
@@ -1647,7 +1647,7 @@
pmz_debug("suspend, switching complete\n");
- mdev->ofdev.dev.power_state = pm_state;
+ mdev->ofdev.dev.power.power_state = pm_state;
return 0;
}
@@ -1663,7 +1663,7 @@
if (uap == NULL)
return 0;
- if (mdev->ofdev.dev.power_state == 0)
+ if (mdev->ofdev.dev.power.power_state == 0)
return 0;
pmz_debug("resume, switching to state 0\n");
@@ -1716,7 +1716,7 @@
pmz_debug("resume, switching complete\n");
- mdev->ofdev.dev.power_state = 0;
+ mdev->ofdev.dev.power.power_state = 0;
return 0;
}
reply other threads:[~2004-11-15 3:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=16792.5879.951131.956305@cargo.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=akpm@osdl.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
/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).