From c8495560687414fc456d51e22e51d692b97b290e Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 25 Feb 2004 20:49:56 -0800 Subject: [PATCH] [PATCH] remove redundant ide_setup_pci_device{s}() declarations --- drivers/ide/pci/aec62xx.c | 2 -- drivers/ide/pci/alim15x3.c | 3 --- drivers/ide/pci/amd74xx.c | 2 -- drivers/ide/pci/cmd64x.c | 2 -- drivers/ide/pci/cs5530.c | 3 --- drivers/ide/pci/generic.c | 5 +---- drivers/ide/pci/hpt34x.c | 2 -- drivers/ide/pci/hpt366.c | 3 --- drivers/ide/pci/it8172.c | 2 -- drivers/ide/pci/ns87415.c | 2 -- drivers/ide/pci/opti621.c | 2 -- drivers/ide/pci/pdc202xx_new.c | 3 --- drivers/ide/pci/pdc202xx_old.c | 3 --- drivers/ide/pci/piix.c | 2 -- drivers/ide/pci/rz1000.c | 2 -- drivers/ide/pci/sc1200.c | 3 --- drivers/ide/pci/serverworks.c | 2 -- drivers/ide/pci/siimage.c | 3 --- drivers/ide/pci/sis5513.c | 3 --- drivers/ide/pci/sl82c105.c | 2 -- drivers/ide/pci/slc90e66.c | 3 --- drivers/ide/pci/trm290.c | 2 -- drivers/ide/pci/via82cxxx.c | 2 -- 23 files changed, 1 insertion(+), 57 deletions(-) diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 3b0b5244a48a1..b43478d4ca11b 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c @@ -490,8 +490,6 @@ static void __init init_dma_aec62xx (ide_hwif_t *hwif, unsigned long dmabase) ide_setup_dma(hwif, dmabase, 8); } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_aec62xx (struct pci_dev *dev, ide_pci_device_t *d) { ide_setup_pci_device(dev, d); diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 28f67d9d7abf5..edacbcebbd681 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c @@ -853,9 +853,6 @@ static void __init init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) ide_setup_dma(hwif, dmabase, 8); } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - /** * alim15x3_init_one - set up an ALi15x3 IDE controller * @dev: PCI device to set up diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index a17af28e9eb3c..6523b0f9885d0 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c @@ -441,8 +441,6 @@ static void __init init_hwif_amd74xx(ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id) { amd_chipset = amd74xx_chipsets + id->driver_data; diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 2fa967504a920..4d7d0b6f1cdc9 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c @@ -744,8 +744,6 @@ static void __init init_hwif_cmd64x (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &cmd64x_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index d0cd2260635d5..346143f668234 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c @@ -404,9 +404,6 @@ static void __init init_hwif_cs5530 (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &cs5530_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index d0a840d28d019..3df212c6b28cf 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c @@ -72,12 +72,9 @@ static void __init init_hwif_generic (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - #if 0 - /* Logic to add back later on */ - + if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) { ide_pci_device_t *unknown = unknown_chipset; // unknown->vendor = dev->vendor; diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index fbd6810f96d5b..9ba9da76cbf51 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c @@ -317,8 +317,6 @@ static void __init init_hwif_hpt34x (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &hpt34x_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index de5f38f320bd2..932f96a1d2600 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -1124,9 +1124,6 @@ static void __init init_dma_hpt366 (ide_hwif_t *hwif, unsigned long dmabase) ide_setup_dma(hwif, dmabase, 8); } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); -extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_hpt374 (struct pci_dev *dev, ide_pci_device_t *d) { struct pci_dev *findev = NULL; diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c index f79a357b2c56b..0f19f8dfd8f3f 100644 --- a/drivers/ide/pci/it8172.c +++ b/drivers/ide/pci/it8172.c @@ -286,8 +286,6 @@ static void __init init_hwif_it8172 (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &it8172_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 4dd37cd44e766..23e017f882e86 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c @@ -217,8 +217,6 @@ static void __init init_hwif_ns87415 (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &ns87415_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index ca8ec44bb2cb2..dd266a878bf0f 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c @@ -348,8 +348,6 @@ static void __init init_hwif_opti621 (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d) { ide_setup_pci_device(dev, d); diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index cf6b0b2d4e769..4c9b364d848bb 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c @@ -612,9 +612,6 @@ static void __init init_hwif_pdc202new (ide_hwif_t *hwif) #endif /* PDC202_DEBUG_CABLE */ } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); -extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_pdcnew (struct pci_dev *dev, ide_pci_device_t *d) { ide_setup_pci_device(dev, d); diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 2a7074f4277be..47ee78f61e2a9 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c @@ -830,9 +830,6 @@ static void __init init_dma_pdc202xx (ide_hwif_t *hwif, unsigned long dmabase) ide_setup_dma(hwif, dmabase, 8); } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); -extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_pdc202ata4 (struct pci_dev *dev, ide_pci_device_t *d) { if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) { diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 9473298446b00..c9e6e8a10e6ec 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c @@ -711,8 +711,6 @@ static void __init init_hwif_piix (ide_hwif_t *hwif) hwif->drives[0].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - /** * init_setup_piix - callback for IDE initialize * @dev: PIIX PCI device diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c index c306b4f0e3a45..222911d755151 100644 --- a/drivers/ide/pci/rz1000.c +++ b/drivers/ide/pci/rz1000.c @@ -54,8 +54,6 @@ static void __init init_hwif_rz1000 (ide_hwif_t *hwif) } } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &rz1000_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 10a95cb740b26..dcc6da433d031 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c @@ -545,9 +545,6 @@ static void __init init_hwif_sc1200 (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &sc1200_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index d19eafe324cdc..2b13fb98a9b42 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c @@ -754,8 +754,6 @@ static void __init init_dma_svwks (ide_hwif_t *hwif, unsigned long dmabase) ide_setup_dma(hwif, dmabase, 8); } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static void __init init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d) { ide_setup_pci_device(dev, d); diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 98d99c0338bb2..ec279ca239be0 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c @@ -1172,9 +1172,6 @@ static void __init init_hwif_siimage (ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - /** * siimage_init_one - pci layer discovery entry * @dev: PCI device diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 2ed759f57fc55..79766a4c52c3a 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -944,9 +944,6 @@ static void __init init_hwif_sis5513 (ide_hwif_t *hwif) return; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &sis5513_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 9556c5197065f..66a4eb9c5f681 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c @@ -481,8 +481,6 @@ static void __init init_hwif_sl82c105(ide_hwif_t *hwif) #endif /* CONFIG_BLK_DEV_IDEDMA */ } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &sl82c105_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index ee245115125c6..4adf27e3ffdb3 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c @@ -364,9 +364,6 @@ static void __init init_hwif_slc90e66 (ide_hwif_t *hwif) #endif /* !CONFIG_BLK_DEV_IDEDMA */ } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - - static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &slc90e66_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index fa94f9b85c880..0469ab1c15dd9 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c @@ -395,8 +395,6 @@ void __init init_hwif_trm290 (ide_hwif_t *hwif) #endif } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &trm290_chipsets[id->driver_data]; diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 752832dd7a105..22d8f7ddff650 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c @@ -607,8 +607,6 @@ static void __init init_hwif_via82cxxx(ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); - static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id) { ide_pci_device_t *d = &via82cxxx_chipsets[id->driver_data]; -- 2.53.0