[PATCH] Fix pmac_zilog.c so it compiles again

From: Paul Mackerras
Date: Sun Nov 14 2004 - 22:37:12 EST


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@xxxxxxxxx>

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;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/