]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
misc: pti, pci drvdata cannot be NULL in ->remove
authorJiri Slaby <jslaby@suse.cz>
Tue, 7 Aug 2012 19:47:30 +0000 (21:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Aug 2012 20:27:51 +0000 (13:27 -0700)
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>
drivers/misc/pti.c

index 5cb61f7e6f8a5e6e70baae054ec5387f2db533fb..88da085e450add278a46aeca2aa5ddc5c1cf4047 100644 (file)
@@ -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);
 }
 
 /*