@@ -179,7 +179,7 @@ static void acard_ahci_pci_print_info(struct ata_host *host)
ahci_print_info(host, scc_s);
}
-static unsigned int acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
+static void acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
{
struct scatterlist *sg;
struct acard_sg *acard_sg = cmd_tbl + AHCI_CMD_TBL_HDR_SZ;
@@ -206,8 +206,6 @@ static unsigned int acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
}
acard_sg[last_si].size |= cpu_to_le32(1 << 31); /* set EOT */
-
- return si;
}
static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc)
@@ -218,7 +216,6 @@ static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc)
void *cmd_tbl;
u32 opts;
const u32 cmd_fis_len = 5; /* five dwords */
- unsigned int n_elem;
/*
* Fill in command table information. First, the header,
@@ -232,9 +229,8 @@ static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc)
memcpy(cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, qc->dev->cdb_len);
}
- n_elem = 0;
if (qc->flags & ATA_QCFLAG_DMAMAP)
- n_elem = acard_ahci_fill_sg(qc, cmd_tbl);
+ acard_ahci_fill_sg(qc, cmd_tbl);
/*
* Fill in command slot information.
Fixes gcc '-Wunused-but-set-variable' warning: drivers/ata/acard-ahci.c: In function acard_ahci_qc_prep: drivers/ata/acard-ahci.c:268:15: warning: variable n_elem set but not used [-Wunused-but-set-variable] It is never used so can be removed. acard_ahci_fill_sg() is called only in one place, use 'void' instead of 'int'. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Hongbo Yao <yaohongbo@huawei.com> --- drivers/ata/acard-ahci.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)