[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)

as seen in linux-next tree:

drivers/s390/scsi/zfcp_dbf.c: In function ‘zfcp_rec_dbf_event_thread’:
drivers/s390/scsi/zfcp_dbf.c:697: warning: passing argument 1 of ‘atomic_read’
 from incompatible pointer type

Caused by recent git commit:

commit 348447e85749120ad600a5c8e23b6bb7058b931d
Author: Martin Peschke <mp3@de.ibm.com>
Date:   Thu Mar 27 14:22:01 2008 +0100

    [SCSI] zfcp: Add trace records for recovery thread and its queues

We are not supposed to poke inside semaphore.

Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Acked-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 85ba4cc4190e4714b4a634a0a669dabe9830cd51..c34a874482a56a4a4bd63dc91d1c011768b613a0 100644 (file)
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -623,7 +623,6 @@ static int zfcp_rec_dbf_view_format(debug_info_t *id, struct debug_view *view,
        zfcp_dbf_out(&p, "id", "%d", r->id2);
        switch (r->id) {
        case ZFCP_REC_DBF_ID_THREAD:
-               zfcp_dbf_out(&p, "sema", "%d", r->u.thread.sema);
                zfcp_dbf_out(&p, "total", "%d", r->u.thread.total);
                zfcp_dbf_out(&p, "ready", "%d", r->u.thread.ready);
                zfcp_dbf_out(&p, "running", "%d", r->u.thread.running);
@@ -694,7 +693,6 @@ void zfcp_rec_dbf_event_thread(u8 id2, struct zfcp_adapter *adapter, int lock)
        memset(r, 0, sizeof(*r));
        r->id = ZFCP_REC_DBF_ID_THREAD;
        r->id2 = id2;
-       r->u.thread.sema = atomic_read(&adapter->erp_ready_sem.count);
        r->u.thread.total = total;
        r->u.thread.ready = ready;
        r->u.thread.running = running;

diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h
index 732a5ba1bea9ad86dfe56089dfb209b6821f185a..54c34e483457dbb11616b8a4b736b86a77e80858 100644 (file)
--- a/drivers/s390/scsi/zfcp_dbf.h
+++ b/drivers/s390/scsi/zfcp_dbf.h
@@ -35,7 +35,6 @@ struct zfcp_dbf_dump {
 } __attribute__ ((packed));
 
 struct zfcp_rec_dbf_record_thread {
-       u32 sema;
        u32 total;
        u32 ready;
        u32 running;