Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / drivers / s390 / char / sclp_sdias.c

diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 06a4d089723272ad54eed3bf7661cb8bc68f3a40..1c064976b32bd322a4e4554e9d335bf1cef71328 100644 (file)
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -30,7 +30,7 @@
 static struct debug_info *sdias_dbf;
 
 static struct sclp_register sclp_sdias_register = {
-       .send_mask = EvTyp_SDIAS_Mask,
+       .send_mask = EVTYP_SDIAS_MASK,
 };
 
 struct sdias_evbuf {
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex);
 
 static void sdias_callback(struct sclp_req *request, void *data)
 {
-       struct sdias_sccb *sccb;
+       struct sdias_sccb *cbsccb;
 
-       sccb = (struct sdias_sccb *) request->sccb;
+       cbsccb = (struct sdias_sccb *) request->sccb;
        sclp_req_done = 1;
        wake_up(&sdias_wq); /* Inform caller, that request is complete */
        TRACE("callback done\n");
@@ -118,7 +118,7 @@ int sclp_sdias_blk_count(void)
 
        sccb.hdr.length = sizeof(sccb);
        sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
-       sccb.evbuf.hdr.type = EvTyp_SDIAS;
+       sccb.evbuf.hdr.type = EVTYP_SDIAS;
        sccb.evbuf.event_qual = EQ_SIZE;
        sccb.evbuf.data_id = DI_FCP_DUMP;
        sccb.evbuf.event_id = 4712;
@@ -177,7 +177,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
 
        sccb.hdr.length = sizeof(sccb);
        sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
-       sccb.evbuf.hdr.type = EvTyp_SDIAS;
+       sccb.evbuf.hdr.type = EVTYP_SDIAS;
        sccb.evbuf.hdr.flags = 0;
        sccb.evbuf.event_qual = EQ_STORE_DATA;
        sccb.evbuf.data_id = DI_FCP_DUMP;
@@ -229,7 +229,7 @@ out:
        return rc;
 }
 
-int __init sdias_init(void)
+int __init sclp_sdias_init(void)
 {
        int rc;
 
@@ -248,7 +248,7 @@ int __init sdias_init(void)
        return 0;
 }
 
-void __exit sdias_exit(void)
+void __exit sclp_sdias_exit(void)
 {
        debug_unregister(sdias_dbf);
        sclp_unregister(&sclp_sdias_register);