Merge branch 'drm-ttm-unmappable' into drm-core-next

[pandora-kernel.git] / drivers / s390 / net / smsgiucv.c

diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 67f2485..7049127 100644 (file)
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <net/iucv/iucv.h>
 #include <asm/cpcmd.h>
 #include <asm/ebcdic.h>
@@ -31,9 +32,9 @@
 
 struct smsg_callback {
        struct list_head list;
-       char *prefix;
+       const char *prefix;
        int len;
-       void (*callback)(char *from, char *str);
+       void (*callback)(const char *from, char *str);
 };
 
 MODULE_AUTHOR
@@ -100,8 +101,8 @@ static void smsg_message_pending(struct iucv_path *path,
        kfree(buffer);
 }
 
-int smsg_register_callback(char *prefix,
-                          void (*callback)(char *from, char *str))
+int smsg_register_callback(const char *prefix,
+                          void (*callback)(const char *from, char *str))
 {
        struct smsg_callback *cb;
 
@@ -117,8 +118,9 @@ int smsg_register_callback(char *prefix,
        return 0;
 }
 
-void smsg_unregister_callback(char *prefix,
-                             void (*callback)(char *from, char *str))
+void smsg_unregister_callback(const char *prefix,
+                             void (*callback)(const char *from,
+                                              char *str))
 {
        struct smsg_callback *cb, *tmp;
 
@@ -176,7 +178,7 @@ static const struct dev_pm_ops smsg_pm_ops = {
 
 static struct device_driver smsg_driver = {
        .owner = THIS_MODULE,
-       .name = "SMSGIUCV",
+       .name = SMSGIUCV_DRV_NAME,
        .bus  = &iucv_bus,
        .pm = &smsg_pm_ops,
 };