From: Chase Southwood <chase.southwood@gmail.com>
Date: Fri, 11 Jul 2014 04:02:27 +0000 (-0500)
Subject: staging: comedi: addi_apci_1564: remove null check of devpriv in apci1564_detach()
X-Git-Tag: firefly_0821_release~176^2~3491^2~908
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=71893bb077a61c7b590bf7780422407a01a409c0;p=firefly-linux-kernel-4.4.55.git

staging: comedi: addi_apci_1564: remove null check of devpriv in apci1564_detach()

There is no need to test whether devpriv is null in this function.  The
check looks left over and we can just remove it.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index e3dcab76a3bc..f91aedd9c869 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -433,14 +433,10 @@ static int apci1564_auto_attach(struct comedi_device *dev,
 
 static void apci1564_detach(struct comedi_device *dev)
 {
-	struct apci1564_private *devpriv = dev->private;
-
-	if (devpriv) {
-		if (dev->iobase)
-			apci1564_reset(dev);
-		if (dev->irq)
-			free_irq(dev->irq, dev);
-	}
+	if (dev->iobase)
+		apci1564_reset(dev);
+	if (dev->irq)
+		free_irq(dev->irq, dev);
 	comedi_pci_disable(dev);
 }