[patch] PowerPC: Removed duplicate query..

[patch] PowerPC: Removed duplicate query..

[Vesa Jääskeläinen]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

Hi,

I was looking at PowerPC's kernel code at one point and noticed that
"/chosen" is queried multiple times. This message contains attachment
removing this duplication.

Thanks,
Vesa Jääskeläinen

[-- Attachment #2: powerpc.diff --]
[-- Type: text/plain, Size: 1369 bytes --]

Index: ChangeLog
===================================================================
RCS file: /sources/grub/grub2/ChangeLog,v
retrieving revision 1.248
diff -u -r1.248 ChangeLog
--- ChangeLog	26 Apr 2006 21:58:35 -0000	1.248
+++ ChangeLog	27 Apr 2006 19:08:39 -0000
@@ -1,3 +1,8 @@
+2006-04-27  Vesa Jaaskelainen  <chaac@nic.fi>
+
+	* kern/powerpc/ieee1275/init.c (grub_machine_init): Removed
+	duplicated query for IEEE-1275's "/chosen".
+
 2006-04-26  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* util/i386/pc/grub-mkimage.c (compress_kernel): Cast arguments
Index: kern/powerpc/ieee1275/init.c
===================================================================
RCS file: /sources/grub/grub2/kern/powerpc/ieee1275/init.c,v
retrieving revision 1.25
diff -u -r1.25 init.c
--- kern/powerpc/ieee1275/init.c	26 Apr 2006 02:20:12 -0000	1.25
+++ kern/powerpc/ieee1275/init.c	27 Apr 2006 19:08:39 -0000
@@ -116,7 +116,6 @@
 grub_machine_init (void)
 {
   char args[256];
-  grub_ieee1275_phandle_t chosen;
   int actual;
   extern char _start;
 
@@ -137,8 +136,7 @@
   grub_ofdisk_init ();
 
   /* Process commandline.  */
-  grub_ieee1275_finddevice ("/chosen", &chosen);
-  if (grub_ieee1275_get_property (chosen, "bootargs", &args,
+  if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootargs", &args,
 				  sizeof args, &actual) == 0
       && actual > 1)
     {