From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 7 Aug 2012 19:47:30 +0000 (+0200)
Subject: misc: pti, pci drvdata cannot be NULL in ->remove
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6333cc65d12fddf9cf79de3950b65bc142784e1;p=openwrt%2Fstaging%2Fblogic.git

misc: pti, pci drvdata cannot be NULL in ->remove

As we set drvdata unconditionally in ->probe, we need not check if it
is NULL. Let us remove the check.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: J Freyensee <james_p_freyensee@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 5cb61f7e6f8a..88da085e450a 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -400,16 +400,13 @@ EXPORT_SYMBOL_GPL(pti_writedata);
  */
 static void __devexit pti_pci_remove(struct pci_dev *pdev)
 {
-	struct pti_dev *drv_data;
+	struct pti_dev *drv_data = pci_get_drvdata(pdev);
 
-	drv_data = pci_get_drvdata(pdev);
-	if (drv_data != NULL) {
-		pci_iounmap(pdev, drv_data->pti_ioaddr);
-		pci_set_drvdata(pdev, NULL);
-		kfree(drv_data);
-		pci_release_region(pdev, 1);
-		pci_disable_device(pdev);
-	}
+	pci_iounmap(pdev, drv_data->pti_ioaddr);
+	pci_set_drvdata(pdev, NULL);
+	kfree(drv_data);
+	pci_release_region(pdev, 1);
+	pci_disable_device(pdev);
 }
 
 /*