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 <[email protected]>
Cc: J Freyensee <[email protected]>
---
 drivers/misc/pti.c |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 5cb61f7..88da085e 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);
 }
 
 /*
-- 
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to