diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-10-03 04:14:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:08 -0400 |
commit | 27ac6036f31dea8117ecc525e0dbfd17b23e8c09 (patch) | |
tree | 9b9e2dabb6d6d5b7bd270bb01a3384cad01b049e | |
parent | 349ae23fe7379a42973bcb1c85f7d43ec583c17d (diff) |
[PATCH] drivers/ide/: cleanups
- setup-pci.c: remove the unused ide_pci_unregister_driver()
- ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/ide/ide-dma.c | 2 | ||||
-rw-r--r-- | drivers/ide/setup-pci.c | 18 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 53feaf82576e..9069766f236e 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -151,8 +151,6 @@ int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *driv | |||
151 | return 0; | 151 | return 0; |
152 | } | 152 | } |
153 | 153 | ||
154 | EXPORT_SYMBOL_GPL(ide_in_drive_list); | ||
155 | |||
156 | /** | 154 | /** |
157 | * ide_dma_intr - IDE DMA interrupt handler | 155 | * ide_dma_intr - IDE DMA interrupt handler |
158 | * @drive: the drive the interrupt is for | 156 | * @drive: the drive the interrupt is for |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 157fe93ea342..0719b6484824 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -795,24 +795,6 @@ int __ide_pci_register_driver(struct pci_driver *driver, struct module *module) | |||
795 | EXPORT_SYMBOL_GPL(__ide_pci_register_driver); | 795 | EXPORT_SYMBOL_GPL(__ide_pci_register_driver); |
796 | 796 | ||
797 | /** | 797 | /** |
798 | * ide_unregister_pci_driver - unregister an IDE driver | ||
799 | * @driver: driver to remove | ||
800 | * | ||
801 | * Unregister a currently installed IDE driver. Returns are the same | ||
802 | * as for pci_unregister_driver | ||
803 | */ | ||
804 | |||
805 | void ide_pci_unregister_driver(struct pci_driver *driver) | ||
806 | { | ||
807 | if(!pre_init) | ||
808 | pci_unregister_driver(driver); | ||
809 | else | ||
810 | list_del(&driver->node); | ||
811 | } | ||
812 | |||
813 | EXPORT_SYMBOL_GPL(ide_pci_unregister_driver); | ||
814 | |||
815 | /** | ||
816 | * ide_scan_pcidev - find an IDE driver for a device | 798 | * ide_scan_pcidev - find an IDE driver for a device |
817 | * @dev: PCI device to check | 799 | * @dev: PCI device to check |
818 | * | 800 | * |
diff --git a/include/linux/ide.h b/include/linux/ide.h index bdb2733208c5..097d16e5ab37 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1193,7 +1193,6 @@ extern int ideprobe_init(void); | |||
1193 | extern void ide_scan_pcibus(int scan_direction) __init; | 1193 | extern void ide_scan_pcibus(int scan_direction) __init; |
1194 | extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner); | 1194 | extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner); |
1195 | #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE) | 1195 | #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE) |
1196 | extern void ide_pci_unregister_driver(struct pci_driver *driver); | ||
1197 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); | 1196 | void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); |
1198 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); | 1197 | extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); |
1199 | 1198 | ||