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

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

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 3a1a958fb5f2843a2132e1a487af739d06417915..1e1f50655bbfb8f01a4896dd830a09ff23f98f99 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -97,7 +97,7 @@ static u8 user_data_sever[16] = {
  * Create the 8 bytes EBCDIC DCSS segment name from
  * an ASCII name, incl. padding
  */
-static inline void dcss_mkname(char *ascii_name, char *ebcdic_name)
+static void dcss_mkname(char *ascii_name, char *ebcdic_name)
 {
        int i;
 
@@ -111,56 +111,6 @@ static inline void dcss_mkname(char *ascii_name, char *ebcdic_name)
        ASCEBC(ebcdic_name, 8);
 }
 
-/*
- * print appropriate error message for segment_load()/segment_type()
- * return code
- */
-static void mon_segment_warn(int rc, char* seg_name)
-{
-       switch (rc) {
-       case -ENOENT:
-               P_WARNING("cannot load/query segment %s, does not exist\n",
-                         seg_name);
-               break;
-       case -ENOSYS:
-               P_WARNING("cannot load/query segment %s, not running on VM\n",
-                         seg_name);
-               break;
-       case -EIO:
-               P_WARNING("cannot load/query segment %s, hardware error\n",
-                         seg_name);
-               break;
-       case -ENOTSUPP:
-               P_WARNING("cannot load/query segment %s, is a multi-part "
-                         "segment\n", seg_name);
-               break;
-       case -ENOSPC:
-               P_WARNING("cannot load/query segment %s, overlaps with "
-                         "storage\n", seg_name);
-               break;
-       case -EBUSY:
-               P_WARNING("cannot load/query segment %s, overlaps with "
-                         "already loaded dcss\n", seg_name);
-               break;
-       case -EPERM:
-               P_WARNING("cannot load/query segment %s, already loaded in "
-                         "incompatible mode\n", seg_name);
-               break;
-       case -ENOMEM:
-               P_WARNING("cannot load/query segment %s, out of memory\n",
-                         seg_name);
-               break;
-       case -ERANGE:
-               P_WARNING("cannot load/query segment %s, exceeds kernel "
-                         "mapping range\n", seg_name);
-               break;
-       default:
-               P_WARNING("cannot load/query segment %s, return value %i\n",
-                         seg_name, rc);
-               break;
-       }
-}
-
 static inline unsigned long mon_mca_start(struct mon_msg *monmsg)
 {
        return *(u32 *) &monmsg->msg.rmmsg;
@@ -191,7 +141,7 @@ static inline u32 mon_rec_end(struct mon_msg *monmsg)
        return *((u32 *) (mon_mca_start(monmsg) + monmsg->mca_offset + 8));
 }
 
-static inline int mon_check_mca(struct mon_msg *monmsg)
+static int mon_check_mca(struct mon_msg *monmsg)
 {
        if ((mon_rec_end(monmsg) <= mon_rec_start(monmsg)) ||
            (mon_rec_start(monmsg) < mon_dcss_start) ||
@@ -209,8 +159,8 @@ static inline int mon_check_mca(struct mon_msg *monmsg)
        return 0;
 }
 
-static inline int mon_send_reply(struct mon_msg *monmsg,
-                                struct mon_private *monpriv)
+static int mon_send_reply(struct mon_msg *monmsg,
+                         struct mon_private *monpriv)
 {
        int rc;
 
@@ -236,7 +186,7 @@ static inline int mon_send_reply(struct mon_msg *monmsg,
        return 0;
 }
 
-static inline void mon_free_mem(struct mon_private *monpriv)
+static void mon_free_mem(struct mon_private *monpriv)
 {
        int i;
 
@@ -246,7 +196,7 @@ static inline void mon_free_mem(struct mon_private *monpriv)
        kfree(monpriv);
 }
 
-static inline struct mon_private *mon_alloc_mem(void)
+static struct mon_private *mon_alloc_mem(void)
 {
        int i;
        struct mon_private *monpriv;
@@ -307,7 +257,7 @@ static inline void mon_next_mca(struct mon_msg *monmsg)
        monmsg->pos = 0;
 }
 
-static inline struct mon_msg *mon_next_message(struct mon_private *monpriv)
+static struct mon_msg *mon_next_message(struct mon_private *monpriv)
 {
        struct mon_msg *monmsg;
 
@@ -547,7 +497,7 @@ static unsigned int mon_poll(struct file *filp, struct poll_table_struct *p)
        return 0;
 }
 
-static struct file_operations mon_fops = {
+static const struct file_operations mon_fops = {
        .owner   = THIS_MODULE,
        .open    = &mon_open,
        .release = &mon_close,
@@ -585,7 +535,7 @@ static int __init mon_init(void)
 
        rc = segment_type(mon_dcss_name);
        if (rc < 0) {
-               mon_segment_warn(rc, mon_dcss_name);
+               segment_warning(rc, mon_dcss_name);
                goto out_iucv;
        }
        if (rc != SEG_TYPE_SC) {
@@ -598,7 +548,7 @@ static int __init mon_init(void)
        rc = segment_load(mon_dcss_name, SEGMENT_SHARED,
                          &mon_dcss_start, &mon_dcss_end);
        if (rc < 0) {
-               mon_segment_warn(rc, mon_dcss_name);
+               segment_warning(rc, mon_dcss_name);
                rc = -EINVAL;
                goto out_iucv;
        }