Merge git://git.infradead.org/users/dhowells/workq-2.6

* git://git.infradead.org/users/dhowells/workq-2.6:
  Actually update the fixed up compile failures.
  WorkQueue: Fix up arch-specific work items where possible
  WorkStruct: make allyesconfig
  WorkStruct: Pass the work_struct pointer instead of context data
  WorkStruct: Merge the pending bit into the wq_data pointer
  WorkStruct: Typedef the work function prototype
  WorkStruct: Separate delayable and non-delayable events.

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5d8862189485..e11b23c641e2 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -719,9 +719,10 @@ again:
         return rc;
 }
 
-static void iscsi_xmitworker(void *data)
+static void iscsi_xmitworker(struct work_struct *work)
 {
-        struct iscsi_conn *conn = data;
+        struct iscsi_conn *conn =
+                container_of(work, struct iscsi_conn, xmitwork);
         int rc;
         /*
          * serialize Xmit worker on a per-connection basis.
@@ -1512,7 +1513,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
         if (conn->mgmtqueue == ERR_PTR(-ENOMEM))
                 goto mgmtqueue_alloc_fail;
 
-        INIT_WORK(&conn->xmitwork, iscsi_xmitworker, conn);
+        INIT_WORK(&conn->xmitwork, iscsi_xmitworker);
 
         /* allocate login_mtask used for the login/text sequences */
         spin_lock_bh(&session->lock);