From 69da88778866f94d246094ac646a0e007cb6891e Mon Sep 17 00:00:00 2001 From: proski Date: Mon, 8 Jun 2009 20:08:59 +0000 Subject: [PATCH] 2009-06-08 Oliver Henshaw * bus/usb/uhci.c: Remove unneeded doubled lines. * bus/usb/ohci.c: Likewise. Change interf to grub_uint32_t. Remove whitespace inside comment. --- ChangeLog | 6 ++++++ bus/usb/ohci.c | 7 ++----- bus/usb/uhci.c | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ccdefe03..fb44b35c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-06-08 Oliver Henshaw + + * 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 * loader/i386/linux.c (grub_cmd_linux): When processing `vga=', use diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c index 6ffa84bc0..55df96ea2 100644 --- 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 090934998..b9d63eba7 100644 --- 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);