From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MDiup-0000sF-Lb for mharc-grub-devel@gnu.org; Mon, 08 Jun 2009 13:45:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MDiuo-0000rf-DH for grub-devel@gnu.org; Mon, 08 Jun 2009 13:45:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MDiuj-0000oa-Re for grub-devel@gnu.org; Mon, 08 Jun 2009 13:45:45 -0400 Received: from [199.232.76.173] (port=49897 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MDiuj-0000oE-EJ for grub-devel@gnu.org; Mon, 08 Jun 2009 13:45:41 -0400 Received: from mail-ew0-f210.google.com ([209.85.219.210]:52212) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MDiuj-0005Nh-23 for grub-devel@gnu.org; Mon, 08 Jun 2009 13:45:41 -0400 Received: by mail-ew0-f210.google.com with SMTP id 6so6603935ewy.42 for ; Mon, 08 Jun 2009 10:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:user-agent:date :from:to:subject:references:content-disposition; bh=/YREeKvTULJuxtluqvN+sTbwVghZviKiI43mNWx9i9w=; b=uUMGl6b6kJmkXQZ51XqTOLF2y4TBJq8Qyx27nz2MhC4tvrNZx0YLKjvXeeBuONfBb3 QhKr33j7feoAZVlXJvH4o3z5OtQK6/mXWLkJyFBDg3SOWiyNWiSILmJMUEIPUXZsUjx6 0tFXiI1PjDsZO6Lw1UiCyQISWeC5ZITxq8NAQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:user-agent:date:from:to:subject:references :content-disposition; b=OXzYwkQ1z60BGTHzSr/m6nJ9iPhLJbQL71nc04OANMa5EQhtHQFClG0iT0EexKpvhl lMh2/qUbgeCHHtdVSuifdwqxEeMJEkVsPVxqspFdvcvBqwzwQ5G/L45/JBwqbaMBwPlj 8VXChNDmsX7q61cNRyffD+/4ubkOaVO6RXvpY= Received: by 10.210.19.7 with SMTP id 7mr1278211ebs.85.1244483140619; Mon, 08 Jun 2009 10:45:40 -0700 (PDT) Received: from localhost (host86-171-7-124.range86-171.btcentralplus.com [86.171.7.124]) by mx.google.com with ESMTPS id 7sm267299eyb.55.2009.06.08.10.45.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Jun 2009 10:45:40 -0700 (PDT) Message-Id: <20090608174537.859956589@gmail.com> User-Agent: quilt/0.47-1 Date: Mon, 08 Jun 2009 18:45:16 +0100 From: oliver.henshaw@gmail.com To: grub-devel@gnu.org References: <6d6c12960906071127l4f73e145s38b8f0937eef8f40@mail.gmail.com> <20090608174515.881183682@gmail.com> Content-Disposition: inline; filename=usb-minor-cleanup X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [PATCH 1/4] Minor Cleanup X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jun 2009 17:45:46 -0000 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;