2020-09-21 08:04:59

by Liu Shixin

Subject: [PATCH -next] sata, highbank: simplify the return expression of ahci_highbank_suspend

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/ata/sata_highbank.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index ad3893c62572..64b2ef15ec19 100644
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -571,7 +571,6 @@ static int ahci_highbank_suspend(struct device *dev)
struct ahci_host_priv *hpriv = host->private_data;
void __iomem *mmio = hpriv->mmio;
u32 ctl;
- int rc;

if (hpriv->flags & AHCI_HFLAG_NO_SUSPEND) {
dev_err(dev, "firmware update required for suspend/resume\n");
@@ -588,11 +587,7 @@ static int ahci_highbank_suspend(struct device *dev)
writel(ctl, mmio + HOST_CTL);
readl(mmio + HOST_CTL); /* flush */

- rc = ata_host_suspend(host, PMSG_SUSPEND);
- if (rc)
- return rc;
-
- return 0;
+ return ata_host_suspend(host, PMSG_SUSPEND);
}

static int ahci_highbank_resume(struct device *dev)
--
2.25.1

2020-10-02 20:54:57

by Jens Axboe

Subject: Re: [PATCH -next] sata, highbank: simplify the return expression of ahci_highbank_suspend

On 9/21/20 2:24 AM, Liu Shixin wrote:
> Simplify the return expression.

Applied, thanks.

--
Jens Axboe