i2o: Fix 32/64bit DMA locking

[linux-2.6-omap-h63xx.git] / drivers / message / i2o / pci.c

diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 3661e6e065d27c705c86d0e5d215b24523939adc..610ef1204e68f83ccfb2cd35f98ab5d3472c2229 100644 (file)
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -15,8 +15,8 @@
  *
  *     Fixes/additions:
  *             Philipp Rumpf
- *             Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
- *             Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
+ *             Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
+ *             Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
  *             Deepak Saxena <deepak@plexity.net>
  *             Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
  *             Alan Cox <alan@redhat.com>:
@@ -186,31 +186,29 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)
                }
        }
 
-       if (i2o_dma_alloc(dev, &c->status, 8, GFP_KERNEL)) {
+       if (i2o_dma_alloc(dev, &c->status, 8)) {
                i2o_pci_free(c);
                return -ENOMEM;
        }
 
-       if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt), GFP_KERNEL)) {
+       if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt))) {
                i2o_pci_free(c);
                return -ENOMEM;
        }
 
-       if (i2o_dma_alloc(dev, &c->dlct, 8192, GFP_KERNEL)) {
+       if (i2o_dma_alloc(dev, &c->dlct, 8192)) {
                i2o_pci_free(c);
                return -ENOMEM;
        }
 
-       if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block),
-                         GFP_KERNEL)) {
+       if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block))) {
                i2o_pci_free(c);
                return -ENOMEM;
        }
 
-       if (i2o_dma_alloc
-           (dev, &c->out_queue,
-            I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *
-            sizeof(u32), GFP_KERNEL)) {
+       if (i2o_dma_alloc(dev, &c->out_queue,
+               I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE *
+                               sizeof(u32))) {
                i2o_pci_free(c);
                return -ENOMEM;
        }