iff -ru kernel-source-ofa-1.4/drivers/infiniband/core/cm.c kernel-source-ofa-1.4.patched/drivers/infiniband/core/cm.c
--- kernel-source-ofa-1.4/drivers/infiniband/core/cm.c	2009-06-03 09:25:49 +0000
+++ kernel-source-ofa-1.4.patched/drivers/infiniband/core/cm.c	2009-06-03 08:50:47 +0000
@@ -3738,7 +3738,7 @@
 	cm_dev->ib_device = ib_device;
 	cm_get_ack_delay(cm_dev);
 
-	cm_dev->device = device_create_drvdata(&cm_class, &ib_device->dev,
+	cm_dev->device = device_create(&cm_class, &ib_device->dev,
 					       MKDEV(0, 0), NULL,
 					       "%s", ib_device->name);
 	if (!cm_dev->device) {
iff -ru kernel-source-ofa-1.4/drivers/infiniband/core/user_mad.c kernel-source-ofa-1.4.patched/drivers/infiniband/core/user_mad.c
--- kernel-source-ofa-1.4/drivers/infiniband/core/user_mad.c	2009-05-12 22:11:02 +0000
+++ kernel-source-ofa-1.4.patched/drivers/infiniband/core/user_mad.c	2009-06-03 08:52:09 +0000
@@ -1016,7 +1016,7 @@
 	if (cdev_add(port->cdev, base_dev + port->dev_num, 1))
 		goto err_cdev;
 
-	port->dev = device_create_drvdata(umad_class, device->dma_device,
+	port->dev = device_create(umad_class, device->dma_device,
 					  port->cdev->dev, port,
 					  "umad%d", port->dev_num);
 	if (IS_ERR(port->dev))
@@ -1036,7 +1036,7 @@
 	if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
 		goto err_sm_cdev;
 
-	port->sm_dev = device_create_drvdata(umad_class, device->dma_device,
+	port->sm_dev = device_create(umad_class, device->dma_device,
 					     port->sm_cdev->dev, port,
 					     "issm%d", port->dev_num);
 	if (IS_ERR(port->sm_dev))
diff -ru kernel-source-ofa-1.4/drivers/infiniband/core/uverbs_main.c kernel-source-ofa-1.4.patched/drivers/infiniband/core/uverbs_main.c
--- kernel-source-ofa-1.4/drivers/infiniband/core/uverbs_main.c	2009-06-03 09:25:49 +0000
+++ kernel-source-ofa-1.4.patched/drivers/infiniband/core/uverbs_main.c	2009-06-03 08:55:16 +0000
@@ -802,7 +802,7 @@
 	if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
 		goto err_cdev;
 
-	uverbs_dev->dev = device_create_drvdata(uverbs_class,
+	uverbs_dev->dev = device_create(uverbs_class,
 						device->dma_device,
 						uverbs_dev->cdev->dev,
 						uverbs_dev,
iff -ru kernel-source-ofa-1.4/drivers/infiniband/hw/ipath/ipath_file_ops.c kernel-source-ofa-1.4.patched/drivers/infiniband/hw/ipath/ipath_file_ops.c
--- kernel-source-ofa-1.4/drivers/infiniband/hw/ipath/ipath_file_ops.c	2009-06-03 09:25:49 +0000
+++ kernel-source-ofa-1.4.patched/drivers/infiniband/hw/ipath/ipath_file_ops.c	2009-06-03 08:55:34 +0000
@@ -2463,7 +2463,7 @@
 		goto err_cdev;
 	}
 
-	device = device_create_drvdata(ipath_class, NULL, dev, NULL, name);
+	device = device_create(ipath_class, NULL, dev, NULL, name);
 
 	if (IS_ERR(device)) {
 		ret = PTR_ERR(device);
diff -ru kernel-source-ofa-1.4/drivers/infiniband/ulp/ipoib/ipoib_ib.c kernel-source-ofa-1.4.patched/drivers/infiniband/ulp/ipoib/ipoib_ib.c
--- kernel-source-ofa-1.4/drivers/infiniband/ulp/ipoib/ipoib_ib.c	2009-06-03 09:25:49 +0000
+++ kernel-source-ofa-1.4.patched/drivers/infiniband/ulp/ipoib/ipoib_ib.c	2009-06-03 08:58:45 +0000
@@ -446,11 +446,11 @@
 		if (dev->features & NETIF_F_LRO)
 			lro_flush_all(&priv->lro.lro_mgr);
 
-		netif_rx_complete(dev, napi);
+		netif_rx_complete( napi);
 		if (unlikely(ib_req_notify_cq(priv->recv_cq,
 					      IB_CQ_NEXT_COMP |
 					      IB_CQ_REPORT_MISSED_EVENTS)) &&
-		    netif_rx_reschedule(dev, napi))
+		    netif_rx_reschedule(napi))
 			goto poll_more;
 	}
 
@@ -462,7 +462,7 @@
 	struct net_device *dev = dev_ptr;
 	struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-	netif_rx_schedule(dev, &priv->napi);
+	netif_rx_schedule(&priv->napi);
 }
 
 static void drain_tx_cq(struct net_device *dev)