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

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

[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 <anemo@mba.ocn.ne.jp>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide-probe.c |    3 ---
 drivers/ide/tx4938ide.c |    1 +
 drivers/ide/tx4939ide.c |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

Index: b/drivers/ide/ide-probe.c
===================================================================
--- a/drivers/ide/ide-probe.c
+++ 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);
 	}
Index: b/drivers/ide/tx4938ide.c
===================================================================
--- a/drivers/ide/tx4938ide.c
+++ 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)
Index: b/drivers/ide/tx4939ide.c
===================================================================
--- a/drivers/ide/tx4939ide.c
+++ 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)

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

[Sergei Shtylyov]

Hello.

Bartlomiej Zolnierkiewicz wrote:

> * 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 <anemo@mba.ocn.ne.jp>
> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
>   
[...]
> Index: b/drivers/ide/tx4938ide.c
> ===================================================================
> --- a/drivers/ide/tx4938ide.c
> +++ 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)
> Index: b/drivers/ide/tx4939ide.c
> ===================================================================
> --- a/drivers/ide/tx4939ide.c
> +++ 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,
>   

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

MBR, Sergei

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

[Atsushi Nemoto]

On Thu, 13 Nov 2008 01:50:12 +0300, Sergei Shtylyov <sshtylyov@ru.mvista.com> wrote:
> > * 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().
...
>    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 <anemo@mba.ocn.ne.jp>