Re: RFC: Compact Flash True IDE Mode Driver

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

On 2/14/06, Kumar Gala <galak@kernel.crashing.org> wrote:
> If this looks good, I'll send a more official patch with an signed-off-by.

Looks good but please add some description and Signed-off-by.

Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

You can send final patch to akpm for inclusion into -mm.

> - k
>
> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
> index 09086b8..359f659 100644
> --- a/drivers/ide/ide-disk.c
> +++ b/drivers/ide/ide-disk.c
> @@ -977,8 +977,6 @@ static void idedisk_setup (ide_drive_t *
>                 ide_dma_verbose(drive);
>         printk("\n");
>
> -       drive->no_io_32bit = id->dword_io ? 1 : 0;
> -
>         /* write cache enabled? */
>         if ((id->csfo & 1) || (id->cfs_enable_1 & (1 << 5)))
>                 drive->wcache = 1;
> diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
> index 427d1c2..1b7b4c5 100644
> --- a/drivers/ide/ide-probe.c
> +++ b/drivers/ide/ide-probe.c
> @@ -858,6 +858,15 @@ static void probe_hwif(ide_hwif_t *hwif)
>                         }
>                 }
>         }
> +
> +       for (unit = 0; unit < MAX_DRIVES; ++unit) {
> +               ide_drive_t *drive = &hwif->drives[unit];
> +
> +               if (hwif->no_io_32bit)
> +                       drive->no_io_32bit = 1;
> +               else
> +                       drive->no_io_32bit = drive->id->dword_io ? 1 : 0;
> +       }
>  }
>
>  static int hwif_init(ide_hwif_t *hwif);
> diff --git a/include/linux/ide.h b/include/linux/ide.h
> index a7fc4cc..8d2db41 100644
> --- a/include/linux/ide.h
> +++ b/include/linux/ide.h
> @@ -792,6 +792,7 @@ typedef struct hwif_s {
>         unsigned        no_dsc     : 1; /* 0 default, 1 dsc_overlap disabled */
>         unsigned        auto_poll  : 1; /* supports nop auto-poll */
>         unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
> +       unsigned        no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
>
>         struct device   gendev;
>         struct completion gendev_rel_comp; /* To deal with device release() */