--- linux-2.4.33.3/drivers/s390/misc/chandev.c	2006-08-31 13:03:20.000000000 -0400
+++ linux-2.4.33.3/drivers/s390/misc/chandev.c	2006-09-11 20:50:00.000000000 -0400
@@ -326,7 +326,7 @@
 
 #define chandev_interrupt_check() \
 if(in_interrupt())                \
-     printk(KERN_WARNING __FUNCTION__ " called under interrupt this shouldn't happen\n")
+     printk(KERN_WARNING " %s called under interrupt this shouldn't happen\n", __FUNCTION__)
 
 
 #define for_each(variable,head) \
@@ -541,7 +541,7 @@
 				case chandev_msck:
 					argc+=3;
 					break;
-				default:
+				default:;
 				}
 				if(have_tag[tagidx]==FALSE)
 					argc++;
@@ -1494,7 +1494,7 @@
 					}
 					sprintf(destnamebuff,"%s%d",basename,idx);
 					return(destnamebuff);
-				next_idx:
+				next_idx:;
 				}
 				printk("chandev_build_device_name was usable to build a unique name for %s\n",basename);
 				return(NULL);