[2277] 2009-06-08 Oliver Henshaw <address@hidden>

[Pavel Roskin]

Revision: 2277
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2277
Author:   proski
Date:     2009-06-08 20:08:59 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
2009-06-08  Oliver Henshaw <address@hidden>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/bus/usb/ohci.c
    trunk/grub2/bus/usb/uhci.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-08 16:12:58 UTC (rev 2276)
+++ trunk/grub2/ChangeLog       2009-06-08 20:08:59 UTC (rev 2277)
@@ -1,3 +1,9 @@
+2009-06-08  Oliver Henshaw <address@hidden>
+
+       * 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  <address@hidden>
 
        * loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use

Modified: trunk/grub2/bus/usb/ohci.c
===================================================================
--- trunk/grub2/bus/usb/ohci.c  2009-06-08 16:12:58 UTC (rev 2276)
+++ trunk/grub2/bus/usb/ohci.c  2009-06-08 20:08:59 UTC (rev 2277)
@@ -118,7 +118,7 @@
 {
   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;
@@ -127,8 +127,6 @@
 
   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);
 
   interf = class & 0xFF;
   subclass = (class >> 16) & 0xFF;
@@ -171,8 +169,7 @@
   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");
 

Modified: trunk/grub2/bus/usb/uhci.c
===================================================================
--- trunk/grub2/bus/usb/uhci.c  2009-06-08 16:12:58 UTC (rev 2276)
+++ trunk/grub2/bus/usb/uhci.c  2009-06-08 20:08:59 UTC (rev 2277)
@@ -151,8 +151,6 @@
 
   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);
 
   subclass = (class >> 16) & 0xFF;
   class >>= 24;