patch-2.3.22 linux/drivers/macintosh/via-pmu.c

• Lines: 48
• Date: Tue Oct 12 10:00:58 1999
• Orig file: v2.3.21/linux/drivers/macintosh/via-pmu.c
• Orig date: Sat Oct 9 11:47:50 1999

diff -u --recursive --new-file v2.3.21/linux/drivers/macintosh/via-pmu.c linux/drivers/macintosh/via-pmu.c
@@ -150,7 +150,7 @@
  * - the number of response bytes which the PMU will return, or
  *   -1 if it will send a length byte.
  */
-static s8 pmu_data_len[256][2] __openfirmwaredata = {
+static const s8 pmu_data_len[256][2] __openfirmwaredata = {
 /*	   0	   1	   2	   3	   4	   5	   6	   7  */
 /*00*/	{-1, 0},{-1, 0},{-1, 0},{-1, 0},{-1, 0},{-1, 0},{-1, 0},{-1, 0},
 /*08*/	{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},
@@ -263,6 +263,20 @@
 {
 	if (vias == NULL)
 		return -ENXIO;
+	return 0;
+}
+
+/*
+ * We can't wait until pmu_init gets called, that happens too late.
+ * It happens after IDE and SCSI initialization, which can take a few
+ * seconds, and by that time the PMU could have given up on us and
+ * turned us off.
+ * This is called from arch/ppc/kernel/pmac_setup.c:pmac_init2().
+ */
+void via_pmu_start(void)
+{
+	if (vias == NULL)
+		return;
 
 	bright_req_1.complete = 1;
 	bright_req_2.complete = 1;
@@ -272,7 +286,7 @@
 			(void *)0)) {
 		printk(KERN_ERR "VIA-PMU: can't get irq %d\n",
 		       vias->intrs[0].line);
-		return -ENXIO;
+		return;
 	}
 
 	/* Enable interrupts */
@@ -282,8 +296,6 @@
 	
 	/* Enable backlight */
 	pmu_enable_backlight(1);
-
-	return 0;
 }
 
 static int __openfirmware