From: Juergen Gross <jgross@suse.com>
Date: Mon, 28 Aug 2017 07:34:00 +0000 (+0200)
Subject: xen/arch/x86/hvm/viridian.c: remove custom_param() error messages
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1552
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa65bc6c279ded827ea64a7eb4651b2e709ee615;p=xen.git

xen/arch/x86/hvm/viridian.c: remove custom_param() error messages

With _cmdline_parse() now issuing error messages in case of illegal
parameters signalled by parsing functions specified in custom_param()
the message issued by parse_viridian_version() can be removed.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
---

diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c
index 2edf9d0b23..e0546f32fc 100644
--- a/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian.c
@@ -1104,7 +1104,7 @@ static int __init parse_viridian_version(const char *arg)
         {
             n[i] = simple_strtoul(arg, &e, 0);
             if ( e != t )
-                goto fail;
+                break;
         }
 
         i++;
@@ -1112,12 +1112,12 @@ static int __init parse_viridian_version(const char *arg)
     } while ( *t );
 
     if ( i != 3 )
-        goto fail;
+        return -EINVAL;
 
     if ( ((typeof(viridian_major))n[0] != n[0]) ||
          ((typeof(viridian_minor))n[1] != n[1]) ||
          ((typeof(viridian_build))n[2] != n[2]) )
-        goto fail;
+        return -EINVAL;
 
     viridian_major = n[0];
     viridian_minor = n[1];
@@ -1126,10 +1126,6 @@ static int __init parse_viridian_version(const char *arg)
     printk("viridian-version = %#x,%#x,%#x\n",
            viridian_major, viridian_minor, viridian_build);
     return 0;
-
- fail:
-    printk(XENLOG_WARNING "Invalid viridian-version, using default\n");
-    return -EINVAL;
 }
 custom_param("viridian-version", parse_viridian_version);