]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xen/events: remove unlikely() from WARN() condition
authorDenis Efremov <efremov@linux.com>
Wed, 25 Sep 2019 23:49:28 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Sep 2019 17:10:17 +0000 (10:10 -0700)
"unlikely(WARN(x))" is excessive. WARN() already uses unlikely()
internally.

Link: http://lkml.kernel.org/r/20190829165025.15750-4-efremov@linux.com
Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Joe Perches <joe@perches.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/xen/events/events_base.c

index 2e8570c09789b38a8f7f8f79d0393011ec313745..6c8843968a52dd6621d275cd1530e46296549ef3 100644 (file)
@@ -247,7 +247,7 @@ static void xen_irq_info_cleanup(struct irq_info *info)
  */
 unsigned int evtchn_from_irq(unsigned irq)
 {
-       if (unlikely(WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq)))
+       if (WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq))
                return 0;
 
        return info_for_irq(irq)->evtchn;