On Wed, Dec 14, 2022 at 7:45 AM Jason Yan <yanaijie@xxxxxxxxxx> wrote:
>
> There is a sas_get_ata_command_set() declaration above sas_get_ata_info()
> to make it compile ok. However this function is defined in the same file
> below. So move it up to save the forward declaration.
>
> Also remove the variable 'fis' which is not needed in this function.
>
> Cc: John Garry <john.g.garry@xxxxxxxxxx>
> Signed-off-by: Jason Yan <yanaijie@xxxxxxxxxx>
> Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
Reviewed-by: Jack Wang <jinpu.wang@xxxxxxxxx>
> ---
> drivers/scsi/libsas/sas_ata.c | 26 +++++++++++---------------
> 1 file changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
> index f7439bf9cdc6..de3439ae358d 100644
> --- a/drivers/scsi/libsas/sas_ata.c
> +++ b/drivers/scsi/libsas/sas_ata.c
> @@ -239,7 +239,17 @@ static struct sas_internal *dev_to_sas_internal(struct domain_device *dev)
> return to_sas_internal(dev->port->ha->core.shost->transportt);
> }
>
> -static int sas_get_ata_command_set(struct domain_device *dev);
> +static int sas_get_ata_command_set(struct domain_device *dev)
> +{
> + struct ata_taskfile tf;
> +
> + if (dev->dev_type == SAS_SATA_PENDING)
> + return ATA_DEV_UNKNOWN;
> +
> + ata_tf_from_fis(dev->frame_rcvd, &tf);
> +
> + return ata_dev_classify(&tf);
> +}
>
> int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy)
> {
> @@ -637,20 +647,6 @@ void sas_ata_task_abort(struct sas_task *task)
> complete(waiting);
> }
>
> -static int sas_get_ata_command_set(struct domain_device *dev)
> -{
> - struct dev_to_host_fis *fis =
> - (struct dev_to_host_fis *) dev->frame_rcvd;
> - struct ata_taskfile tf;
> -
> - if (dev->dev_type == SAS_SATA_PENDING)
> - return ATA_DEV_UNKNOWN;
> -
> - ata_tf_from_fis((const u8 *)fis, &tf);
> -
> - return ata_dev_classify(&tf);
> -}
> -
> void sas_probe_sata(struct asd_sas_port *port)
> {
> struct domain_device *dev, *n;
> --
> 2.31.1
>
