Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/

[Bartlomiej Zolnierkiewicz]

[IDE] piix: kill dummy init_dma_piix()

 drivers/ide/pci/piix.c |   15 ---------------
 drivers/ide/pci/piix.h |   21 ---------------------
 2 files changed, 36 deletions(-)

diff -puN drivers/ide/pci/piix.c~ide-piix-init_dma drivers/ide/pci/piix.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/piix.c~ide-piix-init_dma	2003-10-04 01:07:20.860376848 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/piix.c	2003-10-04 01:07:20.866375936 +0200
@@ -709,21 +709,6 @@ static void __init init_hwif_piix (ide_h
 	hwif->drives[0].autodma = hwif->autodma;
 }
 
-/**
- *	init_dma_piix		-	set up the PIIX DMA
- *	@hwif: IDE interface
- *	@dmabase: DMA PCI base
- *
- *	Set up the DMA on the PIIX controller, providing a DMA base is
- *	available. The PIIX follows the normal specs so we do nothing
- *	magical here.
- */
-
-static void __init init_dma_piix (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 *);
 
 /**
diff -puN drivers/ide/pci/piix.h~ide-piix-init_dma drivers/ide/pci/piix.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/piix.h~ide-piix-init_dma	2003-10-04 01:07:20.863376392 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/piix.h	2003-10-04 01:08:50.420761600 +0200
@@ -30,8 +30,6 @@ static ide_pci_host_proc_t piix_procs[] 
 static void init_setup_piix(struct pci_dev *, ide_pci_device_t *);
 static unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *);
 static void init_hwif_piix(ide_hwif_t *);
-static void init_dma_piix(ide_hwif_t *, unsigned long);
-
 
 /*
  *	Table of the various PIIX capability blocks
@@ -47,7 +45,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -61,7 +58,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -75,7 +71,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= NULL,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= NULL,
 		.channels	= 2,
 		.autodma	= NODMA,
 		.enablebits	= {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
@@ -89,7 +84,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -103,7 +97,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -117,7 +110,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -131,7 +123,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -145,7 +136,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -159,7 +149,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -173,7 +162,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= NOAUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -187,7 +175,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -201,7 +188,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -215,7 +201,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -229,7 +214,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -243,7 +227,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -257,7 +240,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -271,7 +253,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -285,7 +266,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
@@ -299,7 +279,6 @@ static ide_pci_device_t piix_pci_info[] 
 		.init_chipset	= init_chipset_piix,
 		.init_iops	= NULL,
 		.init_hwif	= init_hwif_piix,
-		.init_dma	= init_dma_piix,
 		.channels	= 2,
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},

_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/