console: Remove superfluous readonly check
authorTakashi Iwai <tiwai@suse.de>
Tue, 13 May 2014 10:09:29 +0000 (12:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 May 2014 20:37:21 +0000 (13:37 -0700)
uni_pagedir.readonly is never set.  Let's get rid of superfluous check
codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/consolemap.c

index 3fdc786..610b720 100644 (file)
@@ -179,7 +179,6 @@ struct uni_pagedir {
        unsigned long   sum;
        unsigned char   *inverse_translations[4];
        u16             *inverse_trans_unicode;
-       int             readonly;
 };
 
 static struct uni_pagedir *dflt;
@@ -501,9 +500,6 @@ static int con_do_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
        struct uni_pagedir *p, *q;
 
        p = *vc->vc_uni_pagedir_loc;
-       if (p && p->readonly)
-               return -EIO;
-
        if (!p || --p->refcount) {
                q = kzalloc(sizeof(*p), GFP_KERNEL);
                if (!q) {
@@ -536,19 +532,13 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
        int err = 0, err1, i;
        struct uni_pagedir *p, *q;
 
+       if (!ct)
+               return 0;
+
        console_lock();
 
        /* Save original vc_unipagdir_loc in case we allocate a new one */
        p = *vc->vc_uni_pagedir_loc;
-       if (p->readonly) {
-               console_unlock();
-               return -EIO;
-       }
-       
-       if (!ct) {
-               console_unlock();
-               return 0;
-       }
        
        if (p->refcount > 1) {
                int j, k;