From: Adrian Bunk - 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 Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton --- drivers/ide/ide-dma.c | 2 -- drivers/ide/setup-pci.c | 18 ------------------ include/linux/ide.h | 1 - 3 files changed, 21 deletions(-) diff -puN drivers/ide/ide-dma.c~drivers-ide-cleanups drivers/ide/ide-dma.c --- a/drivers/ide/ide-dma.c~drivers-ide-cleanups +++ a/drivers/ide/ide-dma.c @@ -151,8 +151,6 @@ int ide_in_drive_list(struct hd_driveid return 0; } -EXPORT_SYMBOL_GPL(ide_in_drive_list); - /** * ide_dma_intr - IDE DMA interrupt handler * @drive: the drive the interrupt is for diff -puN drivers/ide/setup-pci.c~drivers-ide-cleanups drivers/ide/setup-pci.c --- a/drivers/ide/setup-pci.c~drivers-ide-cleanups +++ a/drivers/ide/setup-pci.c @@ -795,24 +795,6 @@ int __ide_pci_register_driver(struct pci EXPORT_SYMBOL_GPL(__ide_pci_register_driver); /** - * ide_unregister_pci_driver - unregister an IDE driver - * @driver: driver to remove - * - * Unregister a currently installed IDE driver. Returns are the same - * as for pci_unregister_driver - */ - -void ide_pci_unregister_driver(struct pci_driver *driver) -{ - if(!pre_init) - pci_unregister_driver(driver); - else - list_del(&driver->node); -} - -EXPORT_SYMBOL_GPL(ide_pci_unregister_driver); - -/** * ide_scan_pcidev - find an IDE driver for a device * @dev: PCI device to check * diff -puN include/linux/ide.h~drivers-ide-cleanups include/linux/ide.h --- a/include/linux/ide.h~drivers-ide-cleanups +++ a/include/linux/ide.h @@ -1193,7 +1193,6 @@ extern int ideprobe_init(void); extern void ide_scan_pcibus(int scan_direction) __init; extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner); #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE) -extern void ide_pci_unregister_driver(struct pci_driver *driver); void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); _