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().

Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a64ec259f3d13a50c01468c98669a9712f33d9f1..291dacee52ef84fae8a0c7d8568fa89e0829b78f 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1655,9 +1655,6 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
                if (hwif == NULL)
                        continue;
 
-               if (hwif->chipset == ide_unknown)
-                       hwif->chipset = ide_generic;
-
                if (hwif->present)
                        hwif_register_devices(hwif);
        }

diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 0bb8b0ce456e1832390a70b4ce72c96051c5a618..b4ef218072cd1629737fb35b4cad89505037fffb 100644 (file)
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -226,6 +226,7 @@ static const struct ide_port_info tx4938ide_port_info __initdata = {
 #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)

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 65cd09773a02acb5ce814fd0bdde62469f0cffa1..4a8c5a21bd4c0cc3ab15c172e697193e1ad79a7f 100644 (file)
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -650,6 +650,7 @@ static const struct ide_port_info tx4939ide_port_info __initdata = {
        .pio_mask               = ATA_PIO4,
        .mwdma_mask             = ATA_MWDMA2,
        .udma_mask              = ATA_UDMA5,
+       .chipset                = ide_generic,
 };
 
 static int __init tx4939ide_probe(struct platform_device *pdev)