2009-06-08 Oliver Henshaw <oliver.henshaw@gmail.com>

	* bus/usb/uhci.c: Remove unneeded doubled lines.
	* bus/usb/ohci.c: Likewise. Change interf to grub_uint32_t.
	Remove whitespace inside comment.

diff --git a/ChangeLog b/ChangeLog
index 4ccdefe034d63d22a33898829cc8dbdcac593394..fb44b35c66c59f3a71a44d0108df77fb7d5bf6e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-08  Oliver Henshaw <oliver.henshaw@gmail.com>
+
+       * bus/usb/uhci.c: Remove unneeded doubled lines.
+       * bus/usb/ohci.c: Likewise. Change interf to grub_uint32_t.
+       Remove whitespace inside comment.
+
 2009-06-08  Robert Millan  <rmh.grub@aybabtu.com>
 
        * loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 6ffa84bc0d429b8f83ff15563bd4a907a3528acd..55df96ea21167eef72f225a8761bb308c4ca4377 100644 (file)
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -118,15 +118,13 @@ grub_ohci_pci_iter (int bus, int device, int func,
 {
   grub_uint32_t class;
   grub_uint32_t subclass;
-  int interf;
+  grub_uint32_t interf;
   grub_uint32_t base;
   grub_pci_address_t addr;
   struct grub_ohci *o;
   grub_uint32_t revision;
   grub_uint32_t frame_interval;
 
-  addr = grub_pci_make_address (bus, device, func, 2);
-  class = grub_pci_read (addr);
   addr = grub_pci_make_address (bus, device, func, 2);
   class = grub_pci_read (addr);
 
@@ -171,8 +169,7 @@ grub_ohci_pci_iter (int bus, int device, int func,
   frame_interval = grub_ohci_readreg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL);
 
   /* Suspend the OHCI by issuing a reset.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.
-                                                         */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
   grub_millisleep (1);
   grub_dprintf ("ohci", "OHCI reset\n");
 

diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 090934998ec95e1489b9f2a6164241742cf98013..b9d63eba758b878669324971064b3fae5ce637ee 100644 (file)
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -149,8 +149,6 @@ grub_uhci_pci_iter (int bus, int device, int func,
   struct grub_uhci *u;
   int i;
 
-  addr = grub_pci_make_address (bus, device, func, 2);
-  class = grub_pci_read (addr);
   addr = grub_pci_make_address (bus, device, func, 2);
   class = grub_pci_read (addr);