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

[pandora-kernel.git] / drivers / s390 / cio / cio.c

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 5ec7789..138124f 100644 (file)
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -139,12 +139,11 @@ cio_start_key (struct subchannel *sch,    /* subchannel structure */
               __u8 lpm,                /* logical path mask */
               __u8 key)                /* storage key */
 {
-       char dbf_txt[15];
        int ccode;
        union orb *orb;
 
-       CIO_TRACE_EVENT(4, "stIO");
-       CIO_TRACE_EVENT(4, dev_name(&sch->dev));
+       CIO_TRACE_EVENT(5, "stIO");
+       CIO_TRACE_EVENT(5, dev_name(&sch->dev));
 
        orb = &to_io_private(sch)->orb;
        memset(orb, 0, sizeof(union orb));
@@ -169,8 +168,7 @@ cio_start_key (struct subchannel *sch,      /* subchannel structure */
        ccode = ssch(sch->schid, orb);
 
        /* process condition code */
-       sprintf(dbf_txt, "ccode:%d", ccode);
-       CIO_TRACE_EVENT(4, dbf_txt);
+       CIO_HEX_EVENT(5, &ccode, sizeof(ccode));
 
        switch (ccode) {
        case 0:
@@ -201,16 +199,14 @@ cio_start (struct subchannel *sch, struct ccw1 *cpa, __u8 lpm)
 int
 cio_resume (struct subchannel *sch)
 {
-       char dbf_txt[15];
        int ccode;
 
-       CIO_TRACE_EVENT (4, "resIO");
+       CIO_TRACE_EVENT(4, "resIO");
        CIO_TRACE_EVENT(4, dev_name(&sch->dev));
 
        ccode = rsch (sch->schid);
 
-       sprintf (dbf_txt, "ccode:%d", ccode);
-       CIO_TRACE_EVENT (4, dbf_txt);
+       CIO_HEX_EVENT(4, &ccode, sizeof(ccode));
 
        switch (ccode) {
        case 0:
@@ -235,13 +231,12 @@ cio_resume (struct subchannel *sch)
 int
 cio_halt(struct subchannel *sch)
 {
-       char dbf_txt[15];
        int ccode;
 
        if (!sch)
                return -ENODEV;
 
-       CIO_TRACE_EVENT (2, "haltIO");
+       CIO_TRACE_EVENT(2, "haltIO");
        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
        /*
@@ -249,8 +244,7 @@ cio_halt(struct subchannel *sch)
         */
        ccode = hsch (sch->schid);
 
-       sprintf (dbf_txt, "ccode:%d", ccode);
-       CIO_TRACE_EVENT (2, dbf_txt);
+       CIO_HEX_EVENT(2, &ccode, sizeof(ccode));
 
        switch (ccode) {
        case 0:
@@ -270,13 +264,12 @@ cio_halt(struct subchannel *sch)
 int
 cio_clear(struct subchannel *sch)
 {
-       char dbf_txt[15];
        int ccode;
 
        if (!sch)
                return -ENODEV;
 
-       CIO_TRACE_EVENT (2, "clearIO");
+       CIO_TRACE_EVENT(2, "clearIO");
        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
        /*
@@ -284,8 +277,7 @@ cio_clear(struct subchannel *sch)
         */
        ccode = csch (sch->schid);
 
-       sprintf (dbf_txt, "ccode:%d", ccode);
-       CIO_TRACE_EVENT (2, dbf_txt);
+       CIO_HEX_EVENT(2, &ccode, sizeof(ccode));
 
        switch (ccode) {
        case 0:
@@ -306,19 +298,17 @@ cio_clear(struct subchannel *sch)
 int
 cio_cancel (struct subchannel *sch)
 {
-       char dbf_txt[15];
        int ccode;
 
        if (!sch)
                return -ENODEV;
 
-       CIO_TRACE_EVENT (2, "cancelIO");
+       CIO_TRACE_EVENT(2, "cancelIO");
        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
        ccode = xsch (sch->schid);
 
-       sprintf (dbf_txt, "ccode:%d", ccode);
-       CIO_TRACE_EVENT (2, dbf_txt);
+       CIO_HEX_EVENT(2, &ccode, sizeof(ccode));
 
        switch (ccode) {
        case 0:         /* success */
@@ -429,11 +419,10 @@ EXPORT_SYMBOL_GPL(cio_update_schib);
  */
 int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
 {
-       char dbf_txt[15];
        int retry;
        int ret;
 
-       CIO_TRACE_EVENT (2, "ensch");
+       CIO_TRACE_EVENT(2, "ensch");
        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
        if (sch_is_pseudo_sch(sch))
@@ -460,8 +449,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
                } else
                        break;
        }
-       sprintf (dbf_txt, "ret:%d", ret);
-       CIO_TRACE_EVENT (2, dbf_txt);
+       CIO_HEX_EVENT(2, &ret, sizeof(ret));
        return ret;
 }
 EXPORT_SYMBOL_GPL(cio_enable_subchannel);
@@ -472,11 +460,10 @@ EXPORT_SYMBOL_GPL(cio_enable_subchannel);
  */
 int cio_disable_subchannel(struct subchannel *sch)
 {
-       char dbf_txt[15];
        int retry;
        int ret;
 
-       CIO_TRACE_EVENT (2, "dissch");
+       CIO_TRACE_EVENT(2, "dissch");
        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
        if (sch_is_pseudo_sch(sch))
@@ -495,8 +482,7 @@ int cio_disable_subchannel(struct subchannel *sch)
                } else
                        break;
        }
-       sprintf (dbf_txt, "ret:%d", ret);
-       CIO_TRACE_EVENT (2, dbf_txt);
+       CIO_HEX_EVENT(2, &ret, sizeof(ret));
        return ret;
 }
 EXPORT_SYMBOL_GPL(cio_disable_subchannel);
@@ -578,11 +564,6 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
                        goto out;
        }
        mutex_init(&sch->reg_mutex);
-       /* Set a name for the subchannel */
-       if (cio_is_console(schid))
-               sch->dev.init_name = cio_get_console_sch_name(schid);
-       else
-               dev_set_name(&sch->dev, "0.%x.%04x", schid.ssid, schid.sch_no);
 
        /*
         * The first subchannel that is not-operational (ccode==3)
@@ -686,7 +667,6 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct subchannel console_subchannel;
-static char console_sch_name[10] = "0.x.xxxx";
 static struct io_subchannel_private console_priv;
 static int console_subchannel_in_use;
 
@@ -873,12 +853,6 @@ cio_get_console_subchannel(void)
        return &console_subchannel;
 }
 
-const char *cio_get_console_sch_name(struct subchannel_id schid)
-{
-       snprintf(console_sch_name, 10, "0.%x.%04x", schid.ssid, schid.sch_no);
-       return (const char *)console_sch_name;
-}
-
 #endif
 static int
 __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)