Re: [PATCH 3/4] ide: sanitize handling of IDE_HFLAG_NO_SET_MODE hostflag

[Sergei Shtylyov]

Hello.

Bartlomiej Zolnierkiewicz wrote:

> * Check for IDE_HFLAG_NO_SET_MODE host flag in ide_set_pio(),
>   ide_set_[pio,dma]_mode(), ide_set_xfer_rate() and set_pio_mode().

> * Remove no longer needed IDE_HFLAG_NO_SET_MODE host flag checking
>   from ide_tune_dma().

> * Remove superfluous ->set_pio_mode checking from do_special().

> This is a part of preparations for adding 'struct ide_port_ops'.

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>

> Index: b/drivers/ide/ide-lib.c
> ===================================================================
> --- a/drivers/ide/ide-lib.c
> +++ b/drivers/ide/ide-lib.c
> @@ -353,6 +354,9 @@ int ide_set_pio_mode(ide_drive_t *drive,
>  {
>  	ide_hwif_t *hwif = drive->hwif;
>  
> +	if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
> +		return 0;
> +

   Shouldn't this be considered an error?

>  	if (hwif->set_pio_mode == NULL)
>  		return -1;
>  
> @@ -380,6 +384,9 @@ int ide_set_dma_mode(ide_drive_t *drive,
>  {
>  	ide_hwif_t *hwif = drive->hwif;
>  
> +	if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
> +		return 0;
> +

   Same here....

>  	if (hwif->set_dma_mode == NULL)
>  		return -1;
>  
> @@ -410,7 +417,8 @@ int ide_set_xfer_rate(ide_drive_t *drive
>  {
>  	ide_hwif_t *hwif = drive->hwif;
>  
> -	if (hwif->set_dma_mode == NULL)
> +	if (hwif->set_dma_mode == NULL ||
> +	    (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
>  		return -1;

   Hm, this is was not considered an error before...

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/