diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 15:47:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-10 16:27:51 -0400 |
commit | 065185f604c604ce77c43d7f26faf712f0bfa265 (patch) | |
tree | 05f730f14f4350d0367b064ea1c2a922386c32d5 /drivers/misc/pti.c | |
parent | dda3f32c3a7201ee79e7e6a7b1d827b89759b4bc (diff) |
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>
Diffstat (limited to 'drivers/misc/pti.c')
-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 3bfc8e37cb51..4a24421136a3 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) | |||
393 | } | 393 | } |
394 | EXPORT_SYMBOL_GPL(pti_writedata); | 394 | EXPORT_SYMBOL_GPL(pti_writedata); |
395 | 395 | ||
396 | /** | ||
397 | * pti_pci_remove()- Driver exit method to remove PTI from | ||
398 | * PCI bus. | ||
399 | * @pdev: variable containing pci info of PTI. | ||
400 | */ | ||
401 | static void __devexit pti_pci_remove(struct pci_dev *pdev) | ||
402 | { | ||
403 | struct pti_dev *drv_data = pci_get_drvdata(pdev); | ||
404 | |||
405 | iounmap(drv_data->pti_ioaddr); | ||
406 | pci_set_drvdata(pdev, NULL); | ||
407 | kfree(drv_data); | ||
408 | pci_release_region(pdev, 1); | ||
409 | pci_disable_device(pdev); | ||
410 | } | ||
411 | |||
412 | /* | 396 | /* |
413 | * for the tty_driver_*() basic function descriptions, see tty_driver.h. | 397 | * for the tty_driver_*() basic function descriptions, see tty_driver.h. |
414 | * Specific header comments made for PTI-related specifics. | 398 | * Specific header comments made for PTI-related specifics. |
@@ -881,6 +865,22 @@ static int __devinit pti_pci_probe(struct pci_dev *pdev, | |||
881 | return retval; | 865 | return retval; |
882 | } | 866 | } |
883 | 867 | ||
868 | /** | ||
869 | * pti_pci_remove()- Driver exit method to remove PTI from | ||
870 | * PCI bus. | ||
871 | * @pdev: variable containing pci info of PTI. | ||
872 | */ | ||
873 | static void __devexit pti_pci_remove(struct pci_dev *pdev) | ||
874 | { | ||
875 | struct pti_dev *drv_data = pci_get_drvdata(pdev); | ||
876 | |||
877 | iounmap(drv_data->pti_ioaddr); | ||
878 | pci_set_drvdata(pdev, NULL); | ||
879 | kfree(drv_data); | ||
880 | pci_release_region(pdev, 1); | ||
881 | pci_disable_device(pdev); | ||
882 | } | ||
883 | |||
884 | static struct pci_driver pti_pci_driver = { | 884 | static struct pci_driver pti_pci_driver = { |
885 | .name = PCINAME, | 885 | .name = PCINAME, |
886 | .id_table = pci_ids, | 886 | .id_table = pci_ids, |