Skip to contentSkip to conversation

ide: remove chipset type fixup from ide_host_register()

PATCH In review Bartlomiej Zolnierkiewicz 3 participants 3 messages Nov 12, 2008 – Nov 13, 2008 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 2/6 ide: remove chipset type fixup from ide_host_register()

* Set chipset type explicitly in tx4938ide and tx4939ide host drivers (all other host drivers were updated already).

* Remove no longer used chipset type fixup from ide_host_register().

CC Atsushi Nemoto <[email protected]>
Cc Sergei Shtylyov <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-probe.c |    3 ---
 drivers/ide/tx4938ide.c |    1 +
 drivers/ide/tx4939ide.c |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
drivers/ide/ide-probe.c +0 -3
Index: b/drivers/ide/ide-probe.c
===================================================================
@@ -1654,9 +1654,6 @@ int ide_host_register(struct ide_host *h
 		if (hwif == NULL)
 			continue;
 
-		if (hwif->chipset == ide_unknown)
-			hwif->chipset = ide_generic;
-
 		if (hwif->present)
 			hwif_register_devices(hwif);
 	}
drivers/ide/tx4938ide.c +1 -0
Index: b/drivers/ide/tx4938ide.c
===================================================================
@@ -226,6 +226,7 @@ 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 +1 -0
Index: b/drivers/ide/tx4939ide.c
===================================================================
@@ -644,6 +644,7 @@ 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)
#1 lore raw

Hello.

Quoted 9 lines · Bartlomiej Zolnierkiewicz

* Set chipset type explicitly in tx4938ide and tx4939ide host drivers (all other host drivers were updated already).

* Remove no longer used chipset type fixup from ide_host_register().

CC Atsushi Nemoto <[email protected]>
Cc Sergei Shtylyov <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

[...]

Quoted 17 lines

Index: b/drivers/ide/tx4938ide.c
===================================================================

drivers/ide/tx4938ide.c +1 -0
@@ -226,6 +226,7 @@ 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)

Index: b/drivers/ide/tx4939ide.c
===================================================================

drivers/ide/tx4939ide.c static const struct ide_port_info tx4939 · line 648

Quoted 5 lines
drivers/ide/tx4939ide.c +1 -0
@@ -644,6 +644,7 @@ static const struct ide_port_info tx4939
 	.pio_mask		= ATA_PIO4,
 	.mwdma_mask		= ATA_MWDMA2,
 	.udma_mask		= ATA_UDMA5,
+	.chipset		= ide_generic,

I'm not really sure those are "generic".

MBR, Sergei

Acked-by
#2 lore raw
Quoted 4 lines · Sergei Shtylyov
Quoted 4 lines

* Set chipset type explicitly in tx4938ide and tx4939ide host drivers (all other host drivers were updated already).

* Remove no longer used chipset type fixup from ide_host_register().

...

Quoted 1 line

I'm not really sure those are "generic".

Of course those are "generic" as they don't need any special hacks in ide core :-)

Acked-by Atsushi Nemoto <[email protected]>