Skip to content

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

[PATCH] generic: kill dummy init_dma_generic()

parent 03ebc1b8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 17 deletions
drivers/ide/pci/generic.c
View file @ 7b4da2a8
...@@ -72,11 +72,6 @@ static void __init init_hwif_generic (ide_hwif_t *hwif) ...@@ -72,11 +72,6 @@ static void __init init_hwif_generic (ide_hwif_t *hwif)
hwif->drives[1].autodma = hwif->autodma; hwif->drives[1].autodma = hwif->autodma;
} }
static void init_dma_generic (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 *);
#if 0 #if 0
......
drivers/ide/pci/generic.h
View file @ 7b4da2a8
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
static unsigned int init_chipset_generic(struct pci_dev *, const char *); static unsigned int init_chipset_generic(struct pci_dev *, const char *);
static void init_hwif_generic(ide_hwif_t *); static void init_hwif_generic(ide_hwif_t *);
static void init_dma_generic(ide_hwif_t *, unsigned long);
static ide_pci_device_t generic_chipsets[] __devinitdata = { static ide_pci_device_t generic_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
...@@ -17,7 +16,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -17,7 +16,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}}, .enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
...@@ -30,7 +28,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -30,7 +28,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -43,7 +40,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -43,7 +40,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -56,7 +52,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -56,7 +52,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -69,7 +64,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -69,7 +64,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -82,7 +76,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -82,7 +76,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = NODMA, .autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -95,7 +88,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -95,7 +88,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -108,7 +100,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -108,7 +100,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -121,7 +112,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -121,7 +112,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = NOAUTODMA, .autodma = NOAUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -134,7 +124,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { ...@@ -134,7 +124,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
...@@ -157,7 +146,6 @@ static ide_pci_device_t unknown_chipset[] __devinitdata = { ...@@ -157,7 +146,6 @@ static ide_pci_device_t unknown_chipset[] __devinitdata = {
.init_chipset = init_chipset_generic, .init_chipset = init_chipset_generic,
.init_iops = NULL, .init_iops = NULL,
.init_hwif = init_hwif_generic, .init_hwif = init_hwif_generic,
.init_dma = init_dma_generic,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
......
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