From 71893bb077a61c7b590bf7780422407a01a409c0 Mon Sep 17 00:00:00 2001 From: Chase Southwood Date: Thu, 10 Jul 2014 23:02:27 -0500 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi_apci_1564.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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); } -- 2.34.1