1 files changed, 2 insertions, 5 deletions

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 21136721e60..f9c778443b4 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2675,12 +2675,9 @@ For that it has to be fbound with a non-autoload definition."
       (ad-with-auto-activation-disabled
        (require 'bytecomp)
        (let ((symbol (make-symbol "advice-compilation"))
-             (byte-compile-warnings
-              (if (listp byte-compile-warnings) byte-compile-warnings
-                byte-compile-warning-types)))
+             (byte-compile-warnings byte-compile-warnings))
          (if (featurep 'cl)
-             (setq byte-compile-warnings
-                   (remq 'cl-functions byte-compile-warnings)))
+             (byte-compile-disable-warning 'cl-functions))
          (fset symbol (symbol-function function))
          (byte-compile symbol)
          (fset function (symbol-function symbol))))))