diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 21:47:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-10 13:27:51 -0700 |
| commit | 065185f604c604ce77c43d7f26faf712f0bfa265 (patch) | |
| tree | 05f730f14f4350d0367b064ea1c2a922386c32d5 | |
| parent | dda3f32c3a7201ee79e7e6a7b1d827b89759b4bc (diff) | |
| download | linux-3.10-065185f604c604ce77c43d7f26faf712f0bfa265.tar.gz linux-3.10-065185f604c604ce77c43d7f26faf712f0bfa265.tar.bz2 linux-3.10-065185f604c604ce77c43d7f26faf712f0bfa265.zip | |
misc: pti, move ->remove to the PCI code
The function is lost somewhere in the forest. Move it to have it along
with probe and other pci_driver stuff.
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>
| -rw-r--r-- | drivers/misc/pti.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c index 3bfc8e37cb5..4a24421136a 100644 --- a/drivers/misc/pti.c +++ b/drivers/misc/pti.c @@ -393,22 +393,6 @@ void pti_writedata(struct pti_masterchannel *mc, u8 *buf, int count) } EXPORT_SYMBOL_GPL(pti_writedata); -/** - * pti_pci_remove()- Driver exit method to remove PTI from - * PCI bus. - * @pdev: variable containing pci info of PTI. - */ -static void __devexit pti_pci_remove(struct pci_dev *pdev) -{ - struct pti_dev *drv_data = pci_get_drvdata(pdev); - - iounmap(drv_data->pti_ioaddr); - pci_set_drvdata(pdev, NULL); - kfree(drv_data); - pci_release_region(pdev, 1); - pci_disable_device(pdev); -} - /* * for the tty_driver_*() basic function descriptions, see tty_driver.h. * Specific header comments made for PTI-related specifics. @@ -881,6 +865,22 @@ static int __devinit pti_pci_probe(struct pci_dev *pdev, return retval; } +/** + * pti_pci_remove()- Driver exit method to remove PTI from + * PCI bus. + * @pdev: variable containing pci info of PTI. + */ +static void __devexit pti_pci_remove(struct pci_dev *pdev) +{ + struct pti_dev *drv_data = pci_get_drvdata(pdev); + + iounmap(drv_data->pti_ioaddr); + pci_set_drvdata(pdev, NULL); + kfree(drv_data); + pci_release_region(pdev, 1); + pci_disable_device(pdev); +} + static struct pci_driver pti_pci_driver = { .name = PCINAME, .id_table = pci_ids, |