diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 21:47:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-10 22:27:51 +0200 |
| commit | c6333cc65d12fddf9cf79de3950b65bc142784e1 (patch) | |
| tree | b7348319d5d2dd37a5d345306e839ccf5bf0100b /drivers/misc | |
| parent | misc: pti, add const to pci_device_id table (diff) | |
| download | linux-c6333cc65d12fddf9cf79de3950b65bc142784e1.tar.xz linux-c6333cc65d12fddf9cf79de3950b65bc142784e1.zip | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/pti.c | 15 |
1 files changed, 6 insertions, 9 deletions
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); } /* |