[ofa-general] linux-next: infiniband build failure

[Stephen Rothwell]

Hi All,

Today's build of linux-next (x86_64 allmodconfig) produced this:

drivers/infiniband/hw/ipath/ipath_verbs.c: In function 'ipath_register_ib_device':
drivers/infiniband/hw/ipath/ipath_verbs.c:2070: error: 'struct ib_device' has no member named 'class_dev'

This is caused by the driver-core patch
"ib-convert-struct-class_device-to-struct-device.patch" which changes the
class_dev member of struct ib_device to "dev" and infiniband commit
63fe2f55dcd6d227bb9dc0aedec4431a9a7a8f92 ("IB/ipath: add calls to new
7220 code and enable in build") which adds another reference to class_dev.

I applied the following patch (because reverting the above driver-core
patch was too hard). I am not sure if it is the correct patch, but it
does build  This needs to be sorted out.  Greg, could the driver-core
patch be delivered through the infiniband tree? (This would, of course
cause problems for
driver-core-remove-no-longer-used-struct-class_device.patch.)

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 70bb8a344acb62afb33e8c5f96d568aa1382210e Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri, 4 Apr 2008 13:43:49 +1100
Subject: [PATCH] infiniband-fix-2

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 drivers/infiniband/hw/ipath/ipath_verbs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 466f3fb..6ac0c5c 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -2067,7 +2067,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
 	dev->phys_port_cnt = 1;
 	dev->num_comp_vectors = 1;
 	dev->dma_device = &dd->pcidev->dev;
-	dev->class_dev.dev = dev->dma_device;
+	dev->dev.parent = dev->dma_device;
 	dev->query_device = ipath_query_device;
 	dev->modify_device = ipath_modify_device;
 	dev->query_port = ipath_query_port;
-- 
1.5.4.5