[tip:x86/apic] x86: Remove superfluous NULL pointer check in destroy_irq()

[tip-bot for Bartlomiej Zolnierkiewicz]

Commit-ID:  25f6e89bedd29cc49bfa0d55497e91a671b9ae6e
Gitweb:     http://git.kernel.org/tip/25f6e89bedd29cc49bfa0d55497e91a671b9ae6e
Author:     Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
AuthorDate: Thu, 30 Jul 2009 23:21:18 +0200
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 2 Aug 2009 21:37:00 +0200

x86: Remove superfluous NULL pointer check in destroy_irq()

This takes care of the following entry from Dan's list:

  arch/x86/kernel/apic/io_apic.c +3241 destroy_irq(11) warning: variable derefenced before check 'desc'

Reported-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Eugene Teo <eteo@xxxxxxxxxx>
Cc: Julia Lawall <julia@xxxxxxx>
LKML-Reference: <200907302321.19086.bzolnier@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
 arch/x86/kernel/apic/io_apic.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index cf51b0b..7e92a92 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3185,8 +3185,7 @@ void destroy_irq(unsigned int irq)
 	cfg = desc->chip_data;
 	dynamic_irq_cleanup(irq);
 	/* connect back irq_cfg */
-	if (desc)
-		desc->chip_data = cfg;
+	desc->chip_data = cfg;
 
 	free_irte(irq);
 	spin_lock_irqsave(&vector_lock, flags);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/