From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 14:51:54 +0000 (+0200)
Subject: Remove double defines and use dma_free
X-Git-Tag: 1.99~852^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7db51e329b7e8f0cdeaea60b2fd866105406d9c4;p=thirdparty%2Fgrub.git

Remove double defines and use dma_free
---

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index a42d9fee1..956a27292 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -339,10 +339,8 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   return 0;
 
  fail:
-#ifndef GRUB_MACHINE_MIPS_YEELOONG
   if (o)
-    grub_free ((void *) o->hcca);
-#endif
+    grub_dma_free (o->hcca_chunk);
   grub_free (o);
 
   return 0;
@@ -883,11 +881,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   return err;
 }
 
-#define GRUB_OHCI_SET_PORT_ENABLE (1 << 1)
-#define GRUB_OHCI_CLEAR_PORT_ENABLE (1 << 0)
-#define GRUB_OHCI_SET_PORT_RESET (1 << 4)
-#define GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE (1 << 20)
-
 static grub_err_t
 grub_ohci_portstatus (grub_usb_controller_t dev,
 		      unsigned int port, unsigned int enable)