atang update for 02/02/10
Subsystems (4)
cover atang update for 02/02/10
On top of atang-v4.2:
- nobody has IDE VLB controllers nowadays so move support for them to staging/out and schedule for removal in 2.6.36 (unless somebody steps in to work on it)
- do a small cleanup
The following changes since commit 7119919586b313e5dfe9c146f616550406040b7a:
Bartlomiej Zolnierkiewicz (1):
ide: remove obsolete /proc/ide/ interface
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bart/misc.git atang-v4.3
Bartlomiej Zolnierkiewicz (2):
move host drivers for VLB IDE controllers to staging/out
ide: remove hwif_chipset_t type
drivers/ide/Kconfig | 72 ------------------------
drivers/ide/Makefile | 7 --
drivers/ide/at91_ide.c | 1 -
drivers/ide/au1xxx-ide.c | 1 -
drivers/ide/buddha.c | 1 -
drivers/ide/cmd640.c | 1 -
drivers/ide/delkin_cb.c | 1 -
drivers/ide/falconide.c | 1 -
drivers/ide/gayle.c | 1 -
drivers/ide/icside.c | 2 -
drivers/ide/ide-cs.c | 1 -
drivers/ide/ide-dma.c | 2 +-
drivers/ide/ide-generic.c | 1 -
drivers/ide/ide-h8300.c | 1 -
drivers/ide/ide-pnp.c | 1 -
drivers/ide/ide-probe.c | 2 -
drivers/ide/ide_platform.c | 1 -
drivers/ide/macide.c | 1 -
drivers/ide/palm_bk3710.c | 1 -
drivers/ide/pmac.c | 1 -
drivers/ide/q40ide.c | 1 -
drivers/ide/rapide.c | 1 -
drivers/ide/scc_pata.c | 1 -
drivers/ide/sgiioc4.c | 1 -
drivers/ide/tx4938ide.c | 1 -
drivers/ide/tx4939ide.c | 1 -
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
drivers/staging/ide-vlb/Kconfig | 69 +++++++++++++++++++++++
drivers/staging/ide-vlb/Makefile | 7 ++
drivers/staging/ide-vlb/TODO | 5 ++
drivers/{ide => staging/ide-vlb}/ali14xx.c | 1 -
drivers/{ide => staging/ide-vlb}/dtc2278.c | 1 -
drivers/{ide => staging/ide-vlb}/ht6560b.c | 17 +++---
drivers/{ide => staging/ide-vlb}/ide-4drives.c | 1 -
drivers/{ide => staging/ide-vlb}/qd65xx.c | 3 +-
drivers/{ide => staging/ide-vlb}/qd65xx.h | 0
drivers/{ide => staging/ide-vlb}/umc8672.c | 1 -
include/linux/ide.h | 17 ------
39 files changed, 94 insertions(+), 137 deletions(-)
create mode 100644 drivers/staging/ide-vlb/Kconfig
create mode 100644 drivers/staging/ide-vlb/Makefile
create mode 100644 drivers/staging/ide-vlb/TODO
rename drivers/{ide => staging/ide-vlb}/ali14xx.c (99%)
rename drivers/{ide => staging/ide-vlb}/dtc2278.c (99%)
rename drivers/{ide => staging/ide-vlb}/ht6560b.c (99%)
rename drivers/{ide => staging/ide-vlb}/ide-4drives.c (98%)
rename drivers/{ide => staging/ide-vlb}/qd65xx.c (99%)
rename drivers/{ide => staging/ide-vlb}/qd65xx.h (100%)
rename drivers/{ide => staging/ide-vlb}/umc8672.c (99%)PATCH 1/2 move host drivers for VLB IDE controllers to staging/out
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] move host drivers for VLB IDE controllers to staging/out
- they are for really old hardware that nobody has any longer
- they all require 'magic' parameters to work
- many controllers are also supported by pata_legacy driver
so move them to staging/out and schedule for removal in 2.6.36 unless somebody steps in to work on them.
--- drivers/ide/Kconfig | 72 ----- drivers/ide/Makefile | 7 drivers/ide/ali14xx.c | 249 ------------------ drivers/ide/dtc2278.c | 154 ----------- drivers/ide/ht6560b.c | 384 ----------------------------- drivers/ide/ide-4drives.c | 64 ---- drivers/ide/qd65xx.c | 446 ---------------------------------- drivers/ide/qd65xx.h | 144 ---------- drivers/ide/umc8672.c | 183 ------------- drivers/staging/Kconfig | 2 drivers/staging/Makefile | 1 drivers/staging/ide-vlb/Kconfig | 69 +++++ drivers/staging/ide-vlb/Makefile | 7 drivers/staging/ide-vlb/TODO | 5 drivers/staging/ide-vlb/ali14xx.c | 249 ++++++++++++++++++ drivers/staging/ide-vlb/dtc2278.c | 154 +++++++++++ drivers/staging/ide-vlb/ht6560b.c | 384 +++++++++++++++++++++++++++++ drivers/staging/ide-vlb/ide-4drives.c | 64 ++++ drivers/staging/ide-vlb/qd65xx.c | 446 ++++++++++++++++++++++++++++++++++ drivers/staging/ide-vlb/qd65xx.h | 144 ++++++++++ drivers/staging/ide-vlb/umc8672.c | 183 +++++++++++++ 21 files changed, 1708 insertions(+), 1703 deletions(-)
drivers/ide/Kconfig +0 -72
@@ -826,78 +826,6 @@ config BLK_DEV_PALMCHIP_BK3710 Say Y here if you want to support the onchip IDE controller on the TI DaVinci SoC -# no isa -> no vlb -if ISA && (ALPHA || X86 || MIPS) - -comment "Other IDE chipsets support" -comment "Note: most of these also require special kernel boot parameters" - -config BLK_DEV_4DRIVES - tristate "Generic 4 drives/port support" - help - Certain older chipsets, including the Tekram 690CD, use a single set - of I/O ports at 0x1f0 to control up to four drives, instead of the - customary two drives per port. Support for this can be enabled at - runtime using the "ide-4drives.probe" kernel boot parameter if you - say Y here. - -config BLK_DEV_ALI14XX - tristate "ALI M14xx support" - select IDE_TIMINGS - select IDE_LEGACY - help - This driver is enabled at runtime using the "ali14xx.probe" kernel - boot parameter. It enables support for the secondary IDE interface - of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster - I/O speeds to be set as well. - See the files <file:Documentation/ide/ide.txt> and - <file:drivers/ide/legacy/ali14xx.c> for more info. - -config BLK_DEV_DTC2278 - tristate "DTC-2278 support" - select IDE_XFER_MODE - select IDE_LEGACY - help - This driver is enabled at runtime using the "dtc2278.probe" kernel - boot parameter. It enables support for the secondary IDE interface - of the DTC-2278 card, and permits faster I/O speeds to be set as - well. See the <file:Documentation/ide/ide.txt> and - <file:drivers/ide/legacy/dtc2278.c> files for more info. - -config BLK_DEV_HT6560B - tristate "Holtek HT6560B support" - select IDE_TIMINGS - select IDE_LEGACY - help - This driver is enabled at runtime using the "ht6560b.probe" kernel - boot parameter. It enables support for the secondary IDE interface - of the Holtek card, and permits faster I/O speeds to be set as well. - See the <file:Documentation/ide/ide.txt> and - <file:drivers/ide/legacy/ht6560b.c> files for more info. - -config BLK_DEV_QD65XX - tristate "QDI QD65xx support" - select IDE_TIMINGS - select IDE_LEGACY - help - This driver is enabled at runtime using the "qd65xx.probe" kernel - boot parameter. It permits faster I/O speeds to be set. See the - <file:Documentation/ide/ide.txt> and <file:drivers/ide/legacy/qd65xx.c> - for more info. - -config BLK_DEV_UMC8672 - tristate "UMC-8672 support" - select IDE_XFER_MODE - select IDE_LEGACY - help - This driver is enabled at runtime using the "umc8672.probe" kernel - boot parameter. It enables support for the secondary IDE interface - of the UMC-8672, and permits faster I/O speeds to be set as well. - See the files <file:Documentation/ide/ide.txt> and - <file:drivers/ide/legacy/umc8672.c> for more info. - -endif - config BLK_DEV_IDEDMA def_bool BLK_DEV_IDEDMA_SFF || \ BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
drivers/ide/Makefile +0 -7
@@ -19,13 +19,6 @@ ide-core-$(CONFIG_IDE_LEGACY) += ide-le obj-$(CONFIG_IDE) += ide-core.o -obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o -obj-$(CONFIG_BLK_DEV_UMC8672) += umc8672.o -obj-$(CONFIG_BLK_DEV_DTC2278) += dtc2278.o -obj-$(CONFIG_BLK_DEV_HT6560B) += ht6560b.o -obj-$(CONFIG_BLK_DEV_QD65XX) += qd65xx.o -obj-$(CONFIG_BLK_DEV_4DRIVES) += ide-4drives.o - obj-$(CONFIG_BLK_DEV_GAYLE) += gayle.o obj-$(CONFIG_BLK_DEV_FALCON_IDE) += falconide.o obj-$(CONFIG_BLK_DEV_MAC_IDE) += macide.o
drivers/ide/ali14xx.c deleted +0 -249
249 lines not on this page · raw message
drivers/ide/dtc2278.c deleted +0 -154
154 lines not on this page · raw message
drivers/ide/ht6560b.c deleted +0 -384
384 lines not on this page · raw message
drivers/ide/ide-4drives.c deleted +0 -64
64 lines not on this page · raw message
drivers/ide/qd65xx.c deleted +0 -446
446 lines not on this page · raw message
drivers/ide/qd65xx.h deleted +0 -144
144 lines not on this page · raw message
drivers/ide/umc8672.c deleted +0 -183
183 lines not on this page · raw message
drivers/staging/Kconfig +2 -0
@@ -125,5 +125,7 @@ source "drivers/staging/sep/Kconfig" source "drivers/staging/iio/Kconfig" +source "drivers/staging/ide-vlb/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING
drivers/staging/Makefile +1 -0
@@ -44,3 +44,4 @@ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_RAR_REGISTER) += rar/ obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/ +obj-$(CONFIG_IDE) += ide-vlb/
drivers/staging/ide-vlb/Kconfig new file +69 -0
69 lines not on this page · raw message
drivers/staging/ide-vlb/Makefile new file +7 -0
@@ -0,0 +1,7 @@ + +obj-$(CONFIG_IDE_VLB_ALI14XX) += ali14xx.o +obj-$(CONFIG_IDE_VLB_UMC8672) += umc8672.o +obj-$(CONFIG_IDE_VLB_DTC2278) += dtc2278.o +obj-$(CONFIG_IDE_VLB_HT6560B) += ht6560b.o +obj-$(CONFIG_IDE_VLB_QD65XX) += qd65xx.o +obj-$(CONFIG_IDE_VLB_4DRIVES) += ide-4drives.o
drivers/staging/ide-vlb/TODO new file +5 -0
@@ -0,0 +1,5 @@ +TODO: + - add missing hardware support to drivers/ata/pata_legacy driver + and then maintain it to ensure that it continues to work. Having + the hardware for this is pretty much a requirement. If this does + not happen, the code will be removed in the 2.6.36 kernel release.
drivers/staging/ide-vlb/ali14xx.c new file +249 -0
249 lines not on this page · raw message
drivers/staging/ide-vlb/dtc2278.c new file +154 -0
154 lines not on this page · raw message
drivers/staging/ide-vlb/ht6560b.c new file +384 -0
384 lines not on this page · raw message
drivers/staging/ide-vlb/ide-4drives.c new file +64 -0
64 lines not on this page · raw message
drivers/staging/ide-vlb/qd65xx.c new file +446 -0
342 lines not on this page · raw message
drivers/staging/ide-vlb/qd65xx.h new file +144 -0
144 lines not on this page · raw message
drivers/staging/ide-vlb/umc8672.c new file +183 -0
183 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 1/2] move host drivers for VLB IDE controllers to staging/out
Quoted 11 lines · On Tue, 02 Feb 2010 18:27:08 +0100 Bartlomiej Zolnierkiewicz…
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] move host drivers for VLB IDE controllers to staging/out- they are for really old hardware that nobody has any longer
- they all require 'magic' parameters to work
- many controllers are also supported bypata_legacydriverso move them to staging/out and schedule for removal in 2.6.36 unless somebody steps in to work on them.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
When I actually tried some of the VLB bits while working on the pata_legacy stuff it was clear these hadn't been maintained/used for a very long time indeed. Most of them also are hacks doing stuff like fixed mode settings.
However if the point of the old IDE code was as claimed to keep it as a 'stable' layer throwing chunks of it out doesn't strike me as in keeping with the stated plan ...
Alan
Re: [PATCH 1/2] move host drivers for VLB IDE controllers to staging/out
Quoted 17 lines · Alan Cox
Quoted 11 lines · On Tue, 02 Feb 2010 18:27:08 +0100 Bartlomiej Zolnierkiewicz…
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] move host drivers for VLB IDE controllers to staging/out- they are for really old hardware that nobody has any longer
- they all require 'magic' parameters to work
- many controllers are also supported bypata_legacydriverso move them to staging/out and schedule for removal in 2.6.36 unless somebody steps in to work on them.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>Acked-by Alan Cox <[email protected]>
Quoted 8 lines
When I actually tried some of the VLB bits while working on the
pata_legacystuff it was clear these hadn't been maintained/used for a very long time indeed. Most of them also are hacks doing stuff like fixed mode settings.However if the point of the old IDE code was as claimed to keep it as a 'stable' layer throwing chunks of it out doesn't strike me as in keeping with the stated plan ...
I've always been under the impression that the claim was about adding new stuff and not about removing dead code or ongoing efforts to make whole kernel more maintainable. Either way, Dave would be a much better person to clarify it..
--
Bartlomiej Zolnierkiewicz
Re: [PATCH 1/2] move host drivers for VLB IDE controllers to staging/out
Quoted 23 lines · Bartlomiej Zolnierkiewicz
Quoted 22 lines · Alan Cox
Quoted 11 lines · On Tue, 02 Feb 2010 18:27:08 +0100 Bartlomiej…
From: Bartlomiej Zolnierkiewicz<[email protected]>
Subject: [PATCH] move host drivers for VLB IDE controllers to staging/out- they are for really old hardware that nobody has any longer
- they all require 'magic' parameters to work
- many controllers are also supported bypata_legacydriverso move them to staging/out and schedule for removal in 2.6.36 unless somebody steps in to work on them.
Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>Acked-by Alan Cox<[email protected]>When I actually tried some of the VLB bits while working on the
pata_legacystuff it was clear these hadn't been maintained/used for a very long time indeed. Most of them also are hacks doing stuff like fixed mode settings.
Quoted 8 lines
Quoted 3 lines
However if the point of the old IDE code was as claimed to keep it as a 'stable' layer throwing chunks of it out doesn't strike me as in keeping with the stated plan ...
I've always been under the impression that the claim was about adding new stuff and not about removing dead code or ongoing efforts to make whole kernel more maintainable. Either way, Dave would be a much better person to clarify it..
David's statements at the time were
I'm going to treat IDE as pure legacy, rather than as competition with the PATA drivers which is what people whould be moving over to.
And more importantly I refuse to apply any driver patch that isn't actually tested on said hardware.
"pure legacy" does not usually imply accepting major changes to drivers, changing APIs, and the like.
But if IDE users are happy with this abrupt change of direction, the resumption of frequent, large IDE changes, then that's their call... I would rather they just use libata, but who am I to judge? ;-)
Jeff
Re: [PATCH 1/2] move host drivers for VLB IDE controllers to staging/out
Quoted 33 lines · Jeff Garzik
Quoted 23 lines · Bartlomiej Zolnierkiewicz
Quoted 22 lines · Alan Cox
Quoted 11 lines · On Tue, 02 Feb 2010 18:27:08 +0100 Bartlomiej…
From: Bartlomiej Zolnierkiewicz<[email protected]>
Subject: [PATCH] move host drivers for VLB IDE controllers to staging/out- they are for really old hardware that nobody has any longer
- they all require 'magic' parameters to work
- many controllers are also supported bypata_legacydriverso move them to staging/out and schedule for removal in 2.6.36 unless somebody steps in to work on them.
Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>Acked-by Alan Cox<[email protected]>When I actually tried some of the VLB bits while working on the
pata_legacystuff it was clear these hadn't been maintained/used for a very long time indeed. Most of them also are hacks doing stuff like fixed mode settings.Quoted 8 lines
Quoted 3 lines
However if the point of the old IDE code was as claimed to keep it as a 'stable' layer throwing chunks of it out doesn't strike me as in keeping with the stated plan ...
I've always been under the impression that the claim was about adding new stuff and not about removing dead code or ongoing efforts to make whole kernel more maintainable. Either way, Dave would be a much better person to clarify it..
Quoted 5 lines
David's statements at the time were
I'm going to treat IDE as pure legacy, rather than as competition with the PATA drivers which is what people whould be moving over to.
I believe that the competition part was the result of misinterpretation of the nature of large volume of changes as resulting in added features while those changes were mainly re-organizing and shrinking the source code size (by ~30% in total during last 3 years)..
Quoted 2 lines
"pure legacy" does not usually imply accepting major changes to drivers, changing APIs, and the like.
Your definition probably matches RHEL (or SLES) nicely but upstream kernel and its APIs (i.e. block layer ones) evolve all the time.
It is impossible for any piece of kernel code to be a truly 'lone island'.
Quoted 3 lines
But if IDE users are happy with this abrupt change of direction, the
resumption of frequent, large IDE changes, then that's their call... I
would rather they just use libata, but who am I to judge? ;-)
With atang tree they are free of this dilemma and through code sharing they can (to some degree) use both at the same time! :-)
--
Bartlomiej Zolnierkiewicz
PATCH 2/2 ide: remove hwif_chipset_t type
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: remove hwif_chipset_t type
Fix up ICSIDE DMA hack in ide_find_dma_mode() to use driver name instead of hwif->chipset and remove no longer needed hwif_chipset_t type & co.
--- drivers/ide/ali14xx.c | 1 - drivers/ide/at91_ide.c | 1 - drivers/ide/au1xxx-ide.c | 1 - drivers/ide/buddha.c | 1 - drivers/ide/cmd640.c | 1 - drivers/ide/delkin_cb.c | 1 - drivers/ide/dtc2278.c | 1 - drivers/ide/falconide.c | 1 - drivers/ide/gayle.c | 1 - drivers/ide/ht6560b.c | 1 - drivers/ide/icside.c | 2 -- drivers/ide/ide-4drives.c | 1 - drivers/ide/ide-cs.c | 1 - drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-generic.c | 1 - drivers/ide/ide-h8300.c | 1 - drivers/ide/ide-pnp.c | 1 - drivers/ide/ide-probe.c | 2 -- drivers/ide/ide_platform.c | 1 - drivers/ide/macide.c | 1 - drivers/ide/palm_bk3710.c | 1 - drivers/ide/pmac.c | 1 - drivers/ide/q40ide.c | 1 - drivers/ide/qd65xx.c | 1 - drivers/ide/rapide.c | 1 - drivers/ide/scc_pata.c | 1 - drivers/ide/sgiioc4.c | 1 - drivers/ide/tx4938ide.c | 1 - drivers/ide/tx4939ide.c | 1 - drivers/ide/umc8672.c | 1 - include/linux/ide.h | 17 ----------------- 31 files changed, 1 insertion(+), 49 deletions(-)
drivers/staging/ide-vlb/ali14xx.c +0 -1
@@ -201,7 +201,6 @@ static const struct ide_port_ops ali14xxstatic const struct ide_port_info ali14xx_port_info = { .name =DRV_NAME , - .chipset = ide_ali14xx, .port_ops = &ali14xx_port_ops, .host_flags =IDE_HFLAG_NO_DMA , .pio_mask =ATA_PIO4 ,
drivers/ide/at91_ide.c +0 -1
@@ -214,7 +214,6 @@ static const struct ide_port_info at91_i .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE | IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS, .pio_mask = ATA_PIO6, - .chipset = ide_generic, };/*
drivers/ide/au1xxx-ide.c +0 -1
@@ -498,7 +498,6 @@ static const struct ide_port_info au1xxx#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA .mwdma_mask = ATA_MWDMA2,#endif - .chipset = ide_au1xxx, };static int au_ide_probe (struct platform_device *dev)
drivers/ide/buddha.c +0 -1
@@ -148,7 +148,6 @@ static const struct ide_port_info buddha .port_ops = &buddha_port_ops, .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_generic, };/*
drivers/ide/cmd640.c +0 -1
@@ -687,7 +687,6 @@ static int pci_conf2(void) }static const struct ide_port_info cmd640_port_info__initdata = { - .chipset = ide_cmd640, .host_flags =IDE_HFLAG_SERIALIZE |IDE_HFLAG_NO_DMA | IDE_HFLAG_ABUSE_PREFETCH |
drivers/ide/delkin_cb.c +0 -1
@@ -68,7 +68,6 @@ static const struct ide_port_info delkin IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, .init_chipset = delkin_cb_init_chipset, - .chipset = ide_pci, }; static int __devinit
drivers/staging/ide-vlb/dtc2278.c +0 -1
@@ -93,7 +93,6 @@ static const struct ide_port_ops dtc2278static const struct ide_port_info dtc2278_port_info__initdata = { .name =DRV_NAME , - .chipset = ide_dtc2278, .port_ops = &dtc2278_port_ops, .host_flags =IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_UNMASK_IRQS |
drivers/ide/falconide.c +0 -1
@@ -111,7 +111,6 @@ static const struct ide_port_info falcon .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_generic, };static void __init falconide_setup_ports (struct ide_hw *hw)
drivers/ide/gayle.c +0 -1
@@ -115,7 +115,6 @@ static const struct ide_port_info gayle_ .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_generic, };/*
drivers/staging/ide-vlb/ht6560b.c +0 -1
@@ -345,7 +345,6 @@ static const struct ide_port_ops ht6560bstatic const struct ide_port_info ht6560b_port_info__initdata = { .name =DRV_NAME , - .chipset = ide_ht6560b, .tp_ops = &ht6560b_tp_ops, .port_ops = &ht6560b_port_ops, .host_flags = IDE_HFLAG_SERIALIZE | /* is this needed? */
drivers/ide/icside.c +0 -2
@@ -405,7 +405,6 @@ static void icside_setup_ports(struct idstatic const struct ide_port_info icside_v5_port_info = { .host_flags =IDE_HFLAG_NO_DMA , - .chipset = ide_acorn, }; static int __devinit
@@ -460,7 +459,6 @@ static const struct ide_port_info icside .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO, .mwdma_mask = ATA_MWDMA2, .swdma_mask = ATA_SWDMA2, - .chipset = ide_acorn, }; static int __devinit
drivers/staging/ide-vlb/ide-4drives.c +0 -1
@@ -25,7 +25,6 @@ static const struct ide_port_info ide_4d .port_ops = &ide_4drives_port_ops, .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA | IDE_HFLAG_4DRIVES, - .chipset = ide_4drives, };static int __init ide_4drives_init (void )
drivers/ide/ide-cs.c +0 -1
@@ -147,7 +147,6 @@ static const struct ide_port_info idecs_ .port_ops = &idecs_port_ops, .host_flags = IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_pci, }; static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
drivers/ide/ide-dma.c +1 -1
@@ -331,7 +331,7 @@ u8 ide_find_dma_mode(ide_drive_t *drive, } } -if (hwif->chipset == ide_acorn && mode ==0 ) { +if (!strcmp (hwif->dev->driver->name,"icside" ) && mode ==0 ) {/* * is this correct? */
drivers/ide/ide-generic.c +0 -1
@@ -29,7 +29,6 @@ MODULE_PARM_DESC(probe_mask, "probe maskstatic const struct ide_port_info ide_generic_port_info = { .host_flags =IDE_HFLAG_NO_DMA , - .chipset = ide_generic, };#ifdef CONFIG_ARM
drivers/ide/ide-h8300.c +0 -1
@@ -78,7 +78,6 @@ static inline void hw_setup(struct ide_hstatic const struct ide_port_info h8300_port_info = { .tp_ops = &h8300_tp_ops, .host_flags =IDE_HFLAG_NO_IO_32BIT |IDE_HFLAG_NO_DMA , - .chipset = ide_generic, };static int __init h8300_ide_init (void )
drivers/ide/ide-pnp.c +0 -1
@@ -29,7 +29,6 @@ static struct pnp_device_id idepnp_devicstatic const struct ide_port_info ide_pnp_port_info = { .host_flags =IDE_HFLAG_NO_DMA , - .chipset = ide_generic, };static int idepnp_probe (struct pnp_dev *dev,const struct pnp_device_id *dev_id)
drivers/ide/ide-probe.c +0 -2
@@ -1054,8 +1054,6 @@ static void ide_init_port(ide_hwif_t *hw { hwif->channel = port; - hwif->chipset = d->chipset ? d->chipset : ide_pci; -if (d->init_iops) d->init_iops (hwif);
drivers/ide/ide_platform.c +0 -1
@@ -44,7 +44,6 @@ static void __devinit plat_ide_setup_porstatic const struct ide_port_info platform_ide_port_info = { .host_flags =IDE_HFLAG_NO_DMA , - .chipset = ide_generic, };static int __devinit plat_ide_probe (struct platform_device *pdev)
drivers/ide/macide.c +0 -1
@@ -89,7 +89,6 @@ static const struct ide_port_info macide .port_ops = &macide_port_ops, .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_generic, }; static const char *mac_ide_name[] =
drivers/ide/palm_bk3710.c +0 -1
@@ -305,7 +305,6 @@ static struct ide_port_info __devinitdat .host_flags = IDE_HFLAG_MMIO, .pio_mask = ATA_PIO4, .mwdma_mask = ATA_MWDMA2, - .chipset = ide_palm3710, };static int __init palm_bk3710_probe (struct platform_device *pdev)
drivers/ide/pmac.c +0 -1
@@ -1006,7 +1006,6 @@ static const struct ide_dma_ops pmac_dmastatic const struct ide_port_info pmac_port_info = { .name =DRV_NAME , .init_dma = pmac_ide_init_dma, - .chipset = ide_pmac, .tp_ops = &pmac_tp_ops, .port_ops = &pmac_ide_port_ops, .dma_ops = &pmac_dma_ops,
drivers/ide/q40ide.c +0 -1
@@ -114,7 +114,6 @@ static const struct ide_port_info q40ide .tp_ops = &q40ide_tp_ops, .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, .irq_flags = IRQF_SHARED, - .chipset = ide_generic, };/*
drivers/staging/ide-vlb/qd65xx.c +0 -1
@@ -339,7 +339,6 @@ static const struct ide_port_ops qd6580_static const struct ide_port_info qd65xx_port_info__initdata = { .name =DRV_NAME , .tp_ops = &qd65xx_tp_ops, - .chipset = ide_qd65xx, .host_flags =IDE_HFLAG_IO_32BIT |IDE_HFLAG_NO_DMA , .pio_mask =ATA_PIO4 ,
drivers/ide/rapide.c +0 -1
@@ -13,7 +13,6 @@static const struct ide_port_info rapide_port_info = { .host_flags =IDE_HFLAG_MMIO |IDE_HFLAG_NO_DMA , - .chipset = ide_generic, }; static void rapide_setup_ports(struct ide_hw *hw, void __iomem *base,
drivers/ide/scc_pata.c +0 -1
@@ -822,7 +822,6 @@ static const struct ide_port_info scc_ch .host_flags = IDE_HFLAG_SINGLE, .irq_flags = IRQF_SHARED, .pio_mask = ATA_PIO4, - .chipset = ide_pci, };/**
drivers/ide/sgiioc4.c +0 -1
@@ -522,7 +522,6 @@ static const struct ide_dma_ops sgiioc4_static const struct ide_port_info sgiioc4_port_info__devinitconst = { .name =DRV_NAME , - .chipset = ide_pci, .init_dma = ide_dma_sgiioc4, .tp_ops = &sgiioc4_tp_ops, .port_ops = &sgiioc4_port_ops,
drivers/ide/tx4938ide.c +0 -1
@@ -124,7 +124,6 @@ static const struct ide_port_info tx4938#endif .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, .pio_mask = ATA_PIO5, - .chipset = ide_generic, };static int __init tx4938ide_probe (struct platform_device *pdev)
drivers/ide/tx4939ide.c +0 -1
@@ -532,7 +532,6 @@ static const struct ide_port_info tx4939 .pio_mask = ATA_PIO4, .mwdma_mask = ATA_MWDMA2, .udma_mask = ATA_UDMA5, - .chipset = ide_generic, };static int __init tx4939ide_probe (struct platform_device *pdev)
drivers/staging/ide-vlb/umc8672.c +0 -1
@@ -130,7 +130,6 @@ static const struct ide_port_ops umc8672static const struct ide_port_info umc8672_port_info__initdata = { .name =DRV_NAME , - .chipset = ide_umc8672, .port_ops = &umc8672_port_ops, .host_flags =IDE_HFLAG_NO_DMA , .pio_mask =ATA_PIO4 ,
include/linux/ide.h +0 -17
@@ -157,19 +157,6 @@ enum {#define REQ_UNPARK_HEADS 0x23/* -* hwif_chipset_t is used to keep track of the specific hardware -* chipset used by each IDE interface, if known. -*/ -enum { ide_unknown, ide_generic, ide_pci, - ide_cmd640, ide_dtc2278, ide_ali14xx, - ide_qd65xx, ide_umc8672, ide_ht6560b, - ide_4drives, ide_pmac, ide_acorn, - ide_au1xxx, ide_palm3710 -}; - -typedef u8 hwif_chipset_t ; - -/* * Structure to hold all information about the location of this port */ struct ide_hw {
@@ -705,8 +692,6 @@ typedef struct hwif_s {u8 cbl;/* cable type */ -hwif_chipset_t chipset;/* sub-module for tuning.. */ -struct device *dev;void (*rw_disk)(ide_drive_t *,struct request *);
@@ -1249,8 +1234,6 @@ struct ide_port_info {struct ide_pci_enablebit enablebits[2 ]; -hwif_chipset_t chipset; -u16 max_sectors;/* if < than the default one */ u32 host_flags;