1 files changed, 9 insertions, 4 deletions

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 0d1542f33d87..9a0a1839a377 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -628,11 +628,11 @@ static int __show_line_range(struct line_range *lr, const char *module)
 
         ret = debuginfo__find_line_range(dinfo, lr);
         debuginfo__delete(dinfo);
-        if (ret == 0) {
+        if (ret == 0 || ret == -ENOENT) {
                 pr_warning("Specified source line is not found.\n");
                 return -ENOENT;
         } else if (ret < 0) {
-                pr_warning("Debuginfo analysis failed. (%d)\n", ret);
+                pr_warning("Debuginfo analysis failed.\n");
                 return ret;
         }
 
@@ -641,7 +641,7 @@ static int __show_line_range(struct line_range *lr, const char *module)
         ret = get_real_path(tmp, lr->comp_dir, &lr->path);
         free(tmp);      /* Free old path */
         if (ret < 0) {
-                pr_warning("Failed to find source file. (%d)\n", ret);
+                pr_warning("Failed to find source file path.\n");
                 return ret;
         }
 
@@ -721,9 +721,14 @@ static int show_available_vars_at(struct debuginfo *dinfo,
         ret = debuginfo__find_available_vars_at(dinfo, pev, &vls,
                                                 max_vls, externs);
         if (ret <= 0) {
-                pr_err("Failed to find variables at %s (%d)\n", buf, ret);
+                if (ret == 0 || ret == -ENOENT) {
+                        pr_err("Failed to find the address of %s\n", buf);
+                        ret = -ENOENT;
+                } else
+                        pr_warning("Debuginfo analysis failed.\n");
                 goto end;
         }
+
         /* Some variables are found */
         fprintf(stdout, "Available variables at %s\n", buf);
         for (i = 0; i < ret; i++) {