linux-next: driver-core build failure

linux-next: driver-core build failure

[Stephen Rothwell]

Hi Greg,

I have been carrying the patch below and applying it after the scsi tree
merge for some time now.  Now that the scsi tree has been merged into
Linus' tree, can you add this to the driver-core tree, please?
Preferably merged with the patch that removes KOBJ_NAME_LEN.

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

>From 0975add46554364e3943e56b8e6a4800e38bb9e9 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Jun 2008 15:06:02 +1000
Subject: [PATCH] scsi: fix fallout from KOBJ_NAME_LEN removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/message/fusion/mptbase.c |    2 +-
 drivers/message/fusion/mptbase.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index d18a707..a758110 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1670,7 +1670,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 	INIT_DELAYED_WORK(&ioc->fault_reset_work, mpt_fault_reset_work);
 	spin_lock_init(&ioc->fault_reset_work_lock);
 
-	snprintf(ioc->reset_work_q_name, KOBJ_NAME_LEN, "mpt_poll_%d", ioc->id);
+	snprintf(ioc->reset_work_q_name, sizeof(ioc->reset_work_q_name), "mpt_poll_%d", ioc->id);
 	ioc->reset_work_q =
 		create_singlethread_workqueue(ioc->reset_work_q_name);
 	if (!ioc->reset_work_q) {
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 94ab8f1..dff048c 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -712,7 +712,7 @@ typedef struct _MPT_ADAPTER
 	struct scsi_cmnd	**ScsiLookup;
 	spinlock_t		  scsi_lookup_lock;
 
-	char			 reset_work_q_name[KOBJ_NAME_LEN];
+	char			 reset_work_q_name[20];
 	struct workqueue_struct *reset_work_q;
 	struct delayed_work	 fault_reset_work;
 	spinlock_t		 fault_reset_work_lock;
-- 
1.5.5.3

Re: linux-next: driver-core build failure

[Greg KH]

On Thu, Jul 17, 2008 at 10:36:11AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> I have been carrying the patch below and applying it after the scsi tree
> merge for some time now.  Now that the scsi tree has been merged into
> Linus' tree, can you add this to the driver-core tree, please?
> Preferably merged with the patch that removes KOBJ_NAME_LEN.

Thanks, I will queue this up.

greg k-h

linux-next: driver-core build failure

[Stephen Rothwell]

Hi Greg,

I have been carrying the patch below and applying it after the scsi tree
merge for some time now.  Now that the scsi tree has been merged into
Linus' tree, can you add this to the driver-core tree, please?
Preferably merged with the patch that changes the class_find_device API.

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

>From 66bcc1fea773190ed16597c1b57b9a8601ba1a23 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 6 Jun 2008 14:26:18 +1000
Subject: [PATCH] scsi: fix fallout from the class_find_device API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/scsi/scsi_transport_iscsi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 7794651..5ce9151 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -170,7 +170,7 @@ iscsi_create_endpoint(int dd_size)
 	int err;
 
 	for (id = 1; id < ISCSI_MAX_EPID; id++) {
-		dev = class_find_device(&iscsi_endpoint_class, &id,
+		dev = class_find_device(&iscsi_endpoint_class, NULL, &id,
 					iscsi_match_epid);
 		if (!dev)
 			break;
@@ -221,7 +221,7 @@ struct iscsi_endpoint *iscsi_lookup_endpoint(u64 handle)
 {
 	struct device *dev;
 
-	dev = class_find_device(&iscsi_endpoint_class, &handle,
+	dev = class_find_device(&iscsi_endpoint_class, NULL, &handle,
 				iscsi_match_epid);
 	if (!dev)
 		return NULL;
-- 
1.5.5.3

Re: linux-next: driver-core build failure

[Greg KH]

On Thu, Jul 17, 2008 at 10:32:07AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> I have been carrying the patch below and applying it after the scsi tree
> merge for some time now.  Now that the scsi tree has been merged into
> Linus' tree, can you add this to the driver-core tree, please?
> Preferably merged with the patch that changes the class_find_device API.

Thanks, I will do that.

greg k-h