Re: [PATCH 7/7] libata: reorganize ata_bus_probe()

[Jeff Garzik <jgarzik@pobox.com>]

Tejun Heo wrote:
> Now that reset and configure are converted such that they don't modify
> or disable libata core data structures, reorganize ata_bus_probe() to
> reflect this change.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> 
> ---
> 
>  drivers/scsi/libata-core.c |   46 ++++++++++++++++++++++++--------------------
>  1 files changed, 25 insertions(+), 21 deletions(-)
> 
> 04a9356ddbbfafba7ec9b6b71db30ccad2190e02
> diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
> index 761186d..8c0d48f 100644
> --- a/drivers/scsi/libata-core.c
> +++ b/drivers/scsi/libata-core.c
> @@ -1207,35 +1207,40 @@ err_out_nosup:
>  
>  static int ata_bus_probe(struct ata_port *ap)
>  {
> -	unsigned int i, found = 0;
> +	unsigned int classes[ATA_MAX_DEVICES];
> +	unsigned int i, rc, found = 0;
>  
> -	if (ap->ops->probe_reset) {
> -		unsigned int classes[ATA_MAX_DEVICES];
> -		int rc;
> -
> -		ata_port_probe(ap);
> +	ata_port_probe(ap);
>  
> +	/* reset */
> +	if (ap->ops->probe_reset) {
>  		rc = ap->ops->probe_reset(ap, classes);
> -		if (rc == 0) {
> -			for (i = 0; i < ATA_MAX_DEVICES; i++) {
> -				if (classes[i] == ATA_DEV_UNKNOWN)
> -					classes[i] = ATA_DEV_NONE;
> -				ap->device[i].class = classes[i];
> -			}
> -		} else {
> -			printk(KERN_ERR "ata%u: probe reset failed, "
> -			       "disabling port\n", ap->id);
> -			ata_port_disable(ap);
> +		if (rc) {
> +			printk("ata%u: reset failed (errno=%d)\n", ap->id, rc);
> +			return rc;
>  		}
> -	} else
> +
> +		for (i = 0; i < ATA_MAX_DEVICES; i++)
> +			if (classes[i] == ATA_DEV_UNKNOWN)
> +				classes[i] = ATA_DEV_NONE;
> +	} else {
>  		ap->ops->phy_reset(ap);
>  
> -	if (ap->flags & ATA_FLAG_PORT_DISABLED)
> -		goto err_out;
> +		for (i = 0; i < ATA_MAX_DEVICES; i++) {
> +			if (!(ap->flags & ATA_FLAG_PORT_DISABLED))
> +				classes[i] = ap->device[i].class;
> +			else
> +				ap->device[i].class = ATA_DEV_UNKNOWN;
> +		}
> +		ata_port_probe(ap);
> +	}

the legacy phy_reset code path appears to call ata_port_probe() a second 
time.  otherwise, seems OK.

	Jeff