Changelog: * bus/usb/uhci.c: Remove un-needed doubled lines. * bus/usb/ohci.c: Likewise. Change interf to grub_uint32_t. Remove whitespace inside comment. --- bus/usb/ohci.c | 7 ++----- bus/usb/uhci.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-)
Index: grub2/bus/usb/ohci.c =================================================================== --- grub2.orig/bus/usb/ohci.c +++ grub2/bus/usb/ohci.c @@ -118,7 +118,7 @@ grub_ohci_pci_iter (int bus, int device, { 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 @@ grub_ohci_pci_iter (int bus, int device, 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 @@ grub_ohci_pci_iter (int bus, int device, 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"); Index: grub2/bus/usb/uhci.c =================================================================== --- grub2.orig/bus/usb/uhci.c +++ grub2/bus/usb/uhci.c @@ -151,8 +151,6 @@ grub_uhci_pci_iter (int bus, int device, 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; _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel