* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:42 UTC (permalink / raw)
To: linux-kernel
[IDE] cmd64x: kill dummy init_dma_cmd64x()
drivers/ide/pci/cmd64x.c | 5 -----
drivers/ide/pci/cmd64x.h | 5 -----
2 files changed, 10 deletions(-)
diff -puN drivers/ide/pci/cmd64x.c~ide-cmd64x-init_dma drivers/ide/pci/cmd64x.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/cmd64x.c~ide-cmd64x-init_dma 2003-10-04 00:59:18.224748616 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/cmd64x.c 2003-10-04 00:59:18.231747552 +0200
@@ -742,11 +742,6 @@ static void __init init_hwif_cmd64x (ide
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_cmd64x (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 int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff -puN drivers/ide/pci/cmd64x.h~ide-cmd64x-init_dma drivers/ide/pci/cmd64x.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/cmd64x.h~ide-cmd64x-init_dma 2003-10-04 00:59:18.227748160 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/cmd64x.h 2003-10-04 00:59:18.232747400 +0200
@@ -81,7 +81,6 @@ static ide_pci_host_proc_t cmd64x_procs[
static unsigned int init_chipset_cmd64x(struct pci_dev *, const char *);
static void init_hwif_cmd64x(ide_hwif_t *);
-static void init_dma_cmd64x(ide_hwif_t *, unsigned long);
static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
{ /* 0 */
@@ -91,7 +90,6 @@ static ide_pci_device_t cmd64x_chipsets[
.init_chipset = init_chipset_cmd64x,
.init_iops = NULL,
.init_hwif = init_hwif_cmd64x,
- .init_dma = init_dma_cmd64x,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -104,7 +102,6 @@ static ide_pci_device_t cmd64x_chipsets[
.init_chipset = init_chipset_cmd64x,
.init_iops = NULL,
.init_hwif = init_hwif_cmd64x,
- .init_dma = init_dma_cmd64x,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
@@ -117,7 +114,6 @@ static ide_pci_device_t cmd64x_chipsets[
.init_chipset = init_chipset_cmd64x,
.init_iops = NULL,
.init_hwif = init_hwif_cmd64x,
- .init_dma = init_dma_cmd64x,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -130,7 +126,6 @@ static ide_pci_device_t cmd64x_chipsets[
.init_chipset = init_chipset_cmd64x,
.init_iops = NULL,
.init_hwif = init_hwif_cmd64x,
- .init_dma = init_dma_cmd64x,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:42 UTC (permalink / raw)
To: linux-kernel
[IDE] cs5530: kill dummy init_dma_cs5530()
drivers/ide/pci/cs5530.c | 13 -------------
drivers/ide/pci/cs5530.h | 2 --
2 files changed, 15 deletions(-)
diff -puN drivers/ide/pci/cs5530.c~ide-cs5530-init_dma drivers/ide/pci/cs5530.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/cs5530.c~ide-cs5530-init_dma 2003-10-04 00:59:46.652426952 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/cs5530.c 2003-10-04 00:59:46.658426040 +0200
@@ -404,19 +404,6 @@ static void __init init_hwif_cs5530 (ide
hwif->drives[1].autodma = hwif->autodma;
}
-/**
- * init_dma_cs5530 - set up for DMA
- * @hwif: interface
- * @dmabase: DMA base address
- *
- * FIXME: this can go away
- */
-
-static void __init init_dma_cs5530 (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/cs5530.h~ide-cs5530-init_dma drivers/ide/pci/cs5530.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/cs5530.h~ide-cs5530-init_dma 2003-10-04 00:59:46.655426496 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/cs5530.h 2003-10-04 00:59:46.659425888 +0200
@@ -27,7 +27,6 @@ static ide_pci_host_proc_t cs5530_procs[
static unsigned int init_chipset_cs5530(struct pci_dev *, const char *);
static void init_hwif_cs5530(ide_hwif_t *);
-static void init_dma_cs5530(ide_hwif_t *, unsigned long);
static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
{ /* 0 */
@@ -37,7 +36,6 @@ static ide_pci_device_t cs5530_chipsets[
.init_chipset = init_chipset_cs5530,
.init_iops = NULL,
.init_hwif = init_hwif_cs5530,
- .init_dma = init_dma_cs5530,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:42 UTC (permalink / raw)
To: linux-kernel
[IDE] generic: kill dummy init_dma_generic()
drivers/ide/pci/generic.c | 5 -----
drivers/ide/pci/generic.h | 12 ------------
2 files changed, 17 deletions(-)
diff -puN drivers/ide/pci/generic.c~ide-generic-init_dma drivers/ide/pci/generic.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/generic.c~ide-generic-init_dma 2003-10-04 01:00:02.388034776 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/generic.c 2003-10-04 01:00:02.394033864 +0200
@@ -72,11 +72,6 @@ static void __init init_hwif_generic (id
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 *);
#if 0
diff -puN drivers/ide/pci/generic.h~ide-generic-init_dma drivers/ide/pci/generic.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/generic.h~ide-generic-init_dma 2003-10-04 01:00:02.391034320 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/generic.h 2003-10-04 01:00:02.395033712 +0200
@@ -7,7 +7,6 @@
static unsigned int init_chipset_generic(struct pci_dev *, const char *);
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 = {
{ /* 0 */
@@ -17,7 +16,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
@@ -30,7 +28,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -43,7 +40,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -56,7 +52,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -69,7 +64,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -82,7 +76,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = NODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -95,7 +88,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -108,7 +100,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = NOAUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -121,7 +112,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = NOAUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -134,7 +124,6 @@ static ide_pci_device_t generic_chipsets
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -157,7 +146,6 @@ static ide_pci_device_t unknown_chipset[
.init_chipset = init_chipset_generic,
.init_iops = NULL,
.init_hwif = init_hwif_generic,
- .init_dma = init_dma_generic,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (2 preceding siblings ...)
2003-10-03 23:42 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:43 UTC (permalink / raw)
To: linux-kernel
[IDE] hpt34x: kill dummy init_dma_hpt34x()
drivers/ide/pci/hpt34x.c | 5 -----
drivers/ide/pci/hpt34x.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/hpt34x.c~ide-hpt34x-init_dma drivers/ide/pci/hpt34x.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/hpt34x.c~ide-hpt34x-init_dma 2003-10-04 01:00:19.821384504 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/hpt34x.c 2003-10-04 01:00:19.827383592 +0200
@@ -315,11 +315,6 @@ static void __init init_hwif_hpt34x (ide
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_hpt34x (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 int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff -puN drivers/ide/pci/hpt34x.h~ide-hpt34x-init_dma drivers/ide/pci/hpt34x.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/hpt34x.h~ide-hpt34x-init_dma 2003-10-04 01:00:19.823384200 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/hpt34x.h 2003-10-04 01:00:19.827383592 +0200
@@ -33,7 +33,6 @@ static ide_pci_host_proc_t hpt34x_procs[
static unsigned int init_chipset_hpt34x(struct pci_dev *, const char *);
static void init_hwif_hpt34x(ide_hwif_t *);
-static void init_dma_hpt34x(ide_hwif_t *, unsigned long);
static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
{ /* 0 */
@@ -43,7 +42,6 @@ static ide_pci_device_t hpt34x_chipsets[
.init_chipset = init_chipset_hpt34x,
.init_iops = NULL,
.init_hwif = init_hwif_hpt34x,
- .init_dma = init_dma_hpt34x,
.channels = 2,
.autodma = NOAUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (3 preceding siblings ...)
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:43 UTC (permalink / raw)
To: linux-kernel
[IDE] it8172: kill dummy init_dma_it8172()
drivers/ide/pci/it8172.c | 5 -----
drivers/ide/pci/it8172.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/it8172.c~ide-it8172-init_dma drivers/ide/pci/it8172.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/it8172.c~ide-it8172-init_dma 2003-10-04 01:00:35.851947488 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/it8172.c 2003-10-04 01:00:35.857946576 +0200
@@ -284,11 +284,6 @@ static void __init init_hwif_it8172 (ide
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_it8172 (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 int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff -puN drivers/ide/pci/it8172.h~ide-it8172-init_dma drivers/ide/pci/it8172.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/it8172.h~ide-it8172-init_dma 2003-10-04 01:00:35.853947184 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/it8172.h 2003-10-04 01:00:35.857946576 +0200
@@ -17,7 +17,6 @@ static int it8172_config_chipset_for_dma
static void init_setup_it8172(struct pci_dev *, ide_pci_device_t *);
static unsigned int init_chipset_it8172(struct pci_dev *, const char *);
static void init_hwif_it8172(ide_hwif_t *);
-static void init_dma_it8172(ide_hwif_t *, unsigned long);
static ide_pci_device_t it8172_chipsets[] __devinitdata = {
{ /* 0 */
@@ -28,7 +27,6 @@ static ide_pci_device_t it8172_chipsets[
.init_chipset = init_chipset_it8172,
.init_iops = NULL,
.init_hwif = init_hwif_it8172,
- .init_dma = init_dma_it8172,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (4 preceding siblings ...)
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:43 UTC (permalink / raw)
To: linux-kernel
[IDE] ns87415: kill dummy init_dma_ns87415()
drivers/ide/pci/ns87415.c | 5 -----
drivers/ide/pci/ns87415.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/ns87415.c~ide-ns87415-init_dma drivers/ide/pci/ns87415.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/ns87415.c~ide-ns87415-init_dma 2003-10-04 01:00:59.548345088 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/ns87415.c 2003-10-04 01:00:59.554344176 +0200
@@ -217,11 +217,6 @@ static void __init init_hwif_ns87415 (id
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_ns87415 (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 int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff -puN drivers/ide/pci/ns87415.h~ide-ns87415-init_dma drivers/ide/pci/ns87415.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/ns87415.h~ide-ns87415-init_dma 2003-10-04 01:00:59.550344784 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/ns87415.h 2003-10-04 01:01:36.634707104 +0200
@@ -6,7 +6,6 @@
#include <linux/ide.h>
static void init_hwif_ns87415(ide_hwif_t *);
-static void init_dma_ns87415(ide_hwif_t *, unsigned long);
static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
{ /* 0 */
@@ -16,7 +15,6 @@ static ide_pci_device_t ns87415_chipsets
.init_chipset = NULL,
.init_iops = NULL,
.init_hwif = init_hwif_ns87415,
- .init_dma = init_dma_ns87415,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (5 preceding siblings ...)
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:43 UTC (permalink / raw)
To: linux-kernel
[IDE] opti621: kill dummy init_dma_opti621()
drivers/ide/pci/opti621.c | 5 -----
drivers/ide/pci/opti621.h | 3 ---
2 files changed, 8 deletions(-)
diff -puN drivers/ide/pci/opti621.c~ide-opti621-init_dma drivers/ide/pci/opti621.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/opti621.c~ide-opti621-init_dma 2003-10-04 01:02:44.897329608 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/opti621.c 2003-10-04 01:02:44.903328696 +0200
@@ -348,11 +348,6 @@ static void __init init_hwif_opti621 (id
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_opti621 (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_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
diff -puN drivers/ide/pci/opti621.h~ide-opti621-init_dma drivers/ide/pci/opti621.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/opti621.h~ide-opti621-init_dma 2003-10-04 01:02:44.900329152 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/opti621.h 2003-10-04 01:03:31.271279696 +0200
@@ -7,7 +7,6 @@
static void init_setup_opti621(struct pci_dev *, ide_pci_device_t *);
static void init_hwif_opti621(ide_hwif_t *);
-static void init_dma_opti621(ide_hwif_t *, unsigned long);
static ide_pci_device_t opti621_chipsets[] __devinitdata = {
{ /* 0 */
@@ -18,7 +17,6 @@ static ide_pci_device_t opti621_chipsets
.init_chipset = NULL,
.init_iops = NULL,
.init_hwif = init_hwif_opti621,
- .init_dma = init_dma_opti621,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
@@ -32,7 +30,6 @@ static ide_pci_device_t opti621_chipsets
.init_chipset = NULL,
.init_iops = NULL,
.init_hwif = init_hwif_opti621,
- .init_dma = init_dma_opti621,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (6 preceding siblings ...)
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:43 UTC (permalink / raw)
To: linux-kernel
[IDE] pdc202xx_new: kill dummy init_dma_pdc202new()
drivers/ide/pci/pdc202xx_new.c | 5 -----
drivers/ide/pci/pdc202xx_new.h | 8 --------
2 files changed, 13 deletions(-)
diff -puN drivers/ide/pci/pdc202xx_new.c~ide-pdcnew-init_dma drivers/ide/pci/pdc202xx_new.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/pdc202xx_new.c~ide-pdcnew-init_dma 2003-10-04 01:04:55.593460776 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/pdc202xx_new.c 2003-10-04 01:04:55.599459864 +0200
@@ -563,11 +563,6 @@ static void __init init_hwif_pdc202new (
#endif /* PDC202_DEBUG_CABLE */
}
-static void __init init_dma_pdc202new (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 *);
diff -puN drivers/ide/pci/pdc202xx_new.h~ide-pdcnew-init_dma drivers/ide/pci/pdc202xx_new.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/pdc202xx_new.h~ide-pdcnew-init_dma 2003-10-04 01:04:55.596460320 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/pdc202xx_new.h 2003-10-04 01:05:43.315205968 +0200
@@ -188,7 +188,6 @@ static void init_setup_pdc20270(struct p
static void init_setup_pdc20276(struct pci_dev *dev, ide_pci_device_t *d);
static unsigned int init_chipset_pdcnew(struct pci_dev *, const char *);
static void init_hwif_pdc202new(ide_hwif_t *);
-static void init_dma_pdc202new(ide_hwif_t *, unsigned long);
static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
{ /* 0 */
@@ -199,7 +198,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -213,7 +211,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -227,7 +224,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
@@ -245,7 +241,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -259,7 +254,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -273,7 +267,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
@@ -291,7 +284,6 @@ static ide_pci_device_t pdcnew_chipsets[
.init_chipset = init_chipset_pdcnew,
.init_iops = NULL,
.init_hwif = init_hwif_pdc202new,
- .init_dma = init_dma_pdc202new,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (7 preceding siblings ...)
2003-10-03 23:43 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:44 UTC (permalink / raw)
To: linux-kernel
[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}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (8 preceding siblings ...)
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:44 UTC (permalink / raw)
To: linux-kernel
[IDE] sc1200: kill dummy init_dma_sc1200()
drivers/ide/pci/sc1200.c | 5 -----
drivers/ide/pci/sc1200.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/sc1200.c~ide-sc1200-init_dma drivers/ide/pci/sc1200.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/sc1200.c~ide-sc1200-init_dma 2003-10-04 01:10:32.528238904 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/sc1200.c 2003-10-04 01:10:32.534237992 +0200
@@ -545,11 +545,6 @@ static void __init init_hwif_sc1200 (ide
hwif->drives[1].autodma = hwif->autodma;
}
-static void __init init_dma_sc1200 (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/sc1200.h~ide-sc1200-init_dma drivers/ide/pci/sc1200.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/sc1200.h~ide-sc1200-init_dma 2003-10-04 01:10:32.531238448 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/sc1200.h 2003-10-04 01:11:10.489467920 +0200
@@ -27,7 +27,6 @@ static ide_pci_host_proc_t sc1200_procs[
static unsigned int init_chipset_sc1200(struct pci_dev *, const char *);
static void init_hwif_sc1200(ide_hwif_t *);
-static void init_dma_sc1200(ide_hwif_t *, unsigned long);
static ide_pci_device_t sc1200_chipsets[] __devinitdata = {
{ /* 0 */
@@ -37,7 +36,6 @@ static ide_pci_device_t sc1200_chipsets[
.init_chipset = init_chipset_sc1200,
.init_iops = NULL,
.init_hwif = init_hwif_sc1200,
- .init_dma = init_dma_sc1200,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (9 preceding siblings ...)
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:45 ` Bartlomiej Zolnierkiewicz
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:44 UTC (permalink / raw)
To: linux-kernel
[IDE] siimage: kill dummy init_dma_siimage()
drivers/ide/pci/siimage.c | 14 --------------
drivers/ide/pci/siimage.h | 4 ----
2 files changed, 18 deletions(-)
diff -puN drivers/ide/pci/siimage.c~ide-siimage-init_dma drivers/ide/pci/siimage.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/siimage.c~ide-siimage-init_dma 2003-10-04 01:12:23.480371616 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/siimage.c 2003-10-04 01:12:23.486370704 +0200
@@ -1150,20 +1150,6 @@ static void __init init_hwif_siimage (id
hwif->drives[1].autodma = hwif->autodma;
}
-/**
- * init_dma_siimage - set up IDE DMA
- * @hwif: interface
- * @dmabase: DMA base address to use
- *
- * For the SI chips this requires no special set up so we can just
- * let the IDE DMA core do the usual work.
- */
-
-static void __init init_dma_siimage (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/siimage.h~ide-siimage-init_dma drivers/ide/pci/siimage.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/siimage.h~ide-siimage-init_dma 2003-10-04 01:12:23.483371160 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/siimage.h 2003-10-04 01:12:23.487370552 +0200
@@ -44,7 +44,6 @@ static ide_pci_host_proc_t siimage_procs
static unsigned int init_chipset_siimage(struct pci_dev *, const char *);
static void init_iops_siimage(ide_hwif_t *);
static void init_hwif_siimage(ide_hwif_t *);
-static void init_dma_siimage(ide_hwif_t *, unsigned long);
static ide_pci_device_t siimage_chipsets[] __devinitdata = {
{ /* 0 */
@@ -54,7 +53,6 @@ static ide_pci_device_t siimage_chipsets
.init_chipset = init_chipset_siimage,
.init_iops = init_iops_siimage,
.init_hwif = init_hwif_siimage,
- .init_dma = init_dma_siimage,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -67,7 +65,6 @@ static ide_pci_device_t siimage_chipsets
.init_chipset = init_chipset_siimage,
.init_iops = init_iops_siimage,
.init_hwif = init_hwif_siimage,
- .init_dma = init_dma_siimage,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
@@ -80,7 +77,6 @@ static ide_pci_device_t siimage_chipsets
.init_chipset = init_chipset_siimage,
.init_iops = init_iops_siimage,
.init_hwif = init_hwif_siimage,
- .init_dma = init_dma_siimage,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (10 preceding siblings ...)
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
2003-10-03 23:45 ` Bartlomiej Zolnierkiewicz
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:44 UTC (permalink / raw)
To: linux-kernel
[IDE] sis5513: kill dummy init_dma_sis5513()
drivers/ide/pci/sis5513.c | 5 -----
drivers/ide/pci/sis5513.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/sis5513.c~ide-sis5513-init_dma drivers/ide/pci/sis5513.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/sis5513.c~ide-sis5513-init_dma 2003-10-04 01:12:51.167162584 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/sis5513.c 2003-10-04 01:12:51.173161672 +0200
@@ -942,11 +942,6 @@ static void __init init_hwif_sis5513 (id
return;
}
-static void __init init_dma_sis5513 (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/sis5513.h~ide-sis5513-init_dma drivers/ide/pci/sis5513.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/sis5513.h~ide-sis5513-init_dma 2003-10-04 01:12:51.170162128 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/sis5513.h 2003-10-04 01:13:18.798961912 +0200
@@ -27,7 +27,6 @@ static ide_pci_host_proc_t sis_procs[] _
static unsigned int init_chipset_sis5513(struct pci_dev *, const char *);
static void init_hwif_sis5513(ide_hwif_t *);
-static void init_dma_sis5513(ide_hwif_t *, unsigned long);
static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
{ /* 0 */
@@ -37,7 +36,6 @@ static ide_pci_device_t sis5513_chipsets
.init_chipset = init_chipset_sis5513,
.init_iops = NULL,
.init_hwif = init_hwif_sis5513,
- .init_dma = init_dma_sis5513,
.channels = 2,
.autodma = NOAUTODMA,
.enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH] kill dummy init_dma_* from drivers/ide/pci/
2003-10-03 23:38 [PATCH] kill dummy init_dma_* from drivers/ide/pci/ Bartlomiej Zolnierkiewicz
` (11 preceding siblings ...)
2003-10-03 23:44 ` Bartlomiej Zolnierkiewicz
@ 2003-10-03 23:45 ` Bartlomiej Zolnierkiewicz
12 siblings, 0 replies; 14+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2003-10-03 23:45 UTC (permalink / raw)
To: linux-kernel
[IDE] slc90e66: kill dummy init_dma_slc90e66()
drivers/ide/pci/slc90e66.c | 5 -----
drivers/ide/pci/slc90e66.h | 2 --
2 files changed, 7 deletions(-)
diff -puN drivers/ide/pci/slc90e66.c~ide-slc90e66-init_dma drivers/ide/pci/slc90e66.c
--- linux-2.6.0-test6-bk2/drivers/ide/pci/slc90e66.c~ide-slc90e66-init_dma 2003-10-04 01:14:42.877180080 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/slc90e66.c 2003-10-04 01:14:42.883179168 +0200
@@ -362,11 +362,6 @@ static void __init init_hwif_slc90e66 (i
#endif /* !CONFIG_BLK_DEV_IDEDMA */
}
-static void __init init_dma_slc90e66 (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/slc90e66.h~ide-slc90e66-init_dma drivers/ide/pci/slc90e66.h
--- linux-2.6.0-test6-bk2/drivers/ide/pci/slc90e66.h~ide-slc90e66-init_dma 2003-10-04 01:14:42.879179776 +0200
+++ linux-2.6.0-test6-bk2-root/drivers/ide/pci/slc90e66.h 2003-10-04 01:15:27.292427936 +0200
@@ -29,7 +29,6 @@ static ide_pci_host_proc_t slc90e66_proc
static unsigned int init_chipset_slc90e66(struct pci_dev *, const char *);
static void init_hwif_slc90e66(ide_hwif_t *);
-static void init_dma_slc90e66(ide_hwif_t *, unsigned long);
static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
{ /* 0 */
@@ -39,7 +38,6 @@ static ide_pci_device_t slc90e66_chipset
.init_chipset = init_chipset_slc90e66,
.init_iops = NULL,
.init_hwif = init_hwif_slc90e66,
- .init_dma = init_dma_slc90e66,
.channels = 2,
.autodma = AUTODMA,
.enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
_
^ permalink raw reply [flat|nested] 14+ messages in thread