Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 05/41] misc: pti, pci drvdata cannot be NULL in ->remove | Date | Tue, 7 Aug 2012 21:47:30 +0200 |
| |
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> --- 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
| |