torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ata: ahci_xgene: Use int type for 'rc' to store error codes

Browse Source 
Use int instead of u32 for the 'rc' variable in xgene_ahci_softreset()
to store negative error codes returned by ahci_do_softreset().

In xgene_ahci_pmp_softreset(), remove the redundant 'rc' variable and
directly return the result of the ahci_do_softreset() call instead.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Qianfeng Rong 2025-08-26 15:54:18 +08:00 committed by Damien Le Moal
parent 70c1595c18
commit 82b8166171
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ata/ahci_xgene.c
View File

@ -450,7 +450,6 @@ static int xgene_ahci_pmp_softreset(struct ata_link *link, unsigned int *class,
{ {
int pmp = sata_srst_pmp(link); int pmp = sata_srst_pmp(link);
struct ata_port *ap = link->ap; struct ata_port *ap = link->ap;
u32 rc;
void __iomem *port_mmio = ahci_port_base(ap); void __iomem *port_mmio = ahci_port_base(ap);
u32 port_fbs; u32 port_fbs;
@ -463,9 +462,7 @@ static int xgene_ahci_pmp_softreset(struct ata_link *link, unsigned int *class,
port_fbs |= pmp << PORT_FBS_DEV_OFFSET; port_fbs |= pmp << PORT_FBS_DEV_OFFSET;
writel(port_fbs, port_mmio + PORT_FBS); writel(port_fbs, port_mmio + PORT_FBS);
rc = ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready); return ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready);
return rc;
} }
/** /**
@ -500,7 +497,7 @@ static int xgene_ahci_softreset(struct ata_link *link, unsigned int *class,
u32 port_fbs; u32 port_fbs;
u32 port_fbs_save; u32 port_fbs_save;
u32 retry = 1; u32 retry = 1;
u32 rc; int rc;
port_fbs_save = readl(port_mmio + PORT_FBS); port_fbs_save = readl(port_mmio + PORT_FBS);