Skip to content

L
linux
Commit d32abb8b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds
Browse files
Options

[PATCH] piix: kill dummy init_dma_piix()

parent a1f59d16
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 36 deletions
drivers/ide/pci/piix.c
View file @ d32abb8b
...@@ -709,21 +709,6 @@ static void __init init_hwif_piix (ide_hwif_t *hwif) ...@@ -709,21 +709,6 @@ static void __init init_hwif_piix (ide_hwif_t *hwif)
hwif->drives[0].autodma = hwif->autodma; 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 *); extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
/** /**
......
drivers/ide/pci/piix.h
View file @ d32abb8b
...@@ -30,8 +30,6 @@ static ide_pci_host_proc_t piix_procs[] __devinitdata = { ...@@ -30,8 +30,6 @@ static ide_pci_host_proc_t piix_procs[] __devinitdata = {
static void init_setup_piix(struct pci_dev *, ide_pci_device_t *); 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 unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *);
static void init_hwif_piix(ide_hwif_t *); 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 * Table of the various PIIX capability blocks
...@@ -47,7 +45,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -47,7 +45,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -61,7 +58,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -61,7 +58,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -75,7 +71,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -75,7 +71,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = NULL, .init_chipset = NULL,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = NULL,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.enablebits = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}}, .enablebits = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
...@@ -89,7 +84,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -89,7 +84,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -103,7 +97,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -103,7 +97,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -117,7 +110,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -117,7 +110,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -131,7 +123,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -131,7 +123,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -145,7 +136,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -145,7 +136,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -159,7 +149,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -159,7 +149,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -173,7 +162,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -173,7 +162,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -187,7 +175,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -187,7 +175,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -201,7 +188,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -201,7 +188,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -215,7 +201,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -215,7 +201,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -229,7 +214,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -229,7 +214,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -243,7 +227,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -243,7 +227,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -257,7 +240,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -257,7 +240,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -271,7 +253,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -271,7 +253,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -285,7 +266,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -285,7 +266,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
...@@ -299,7 +279,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { ...@@ -299,7 +279,6 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
.init_chipset = init_chipset_piix, .init_chipset = init_chipset_piix,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_piix, .init_hwif = init_hwif_piix,
.init_dma = init_dma_piix,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7