[PATCH] ata/ahci: simplify ahci_read_id

[PATCH] ata/ahci: simplify ahci_read_id

[Uwe Kleine-König]

This is a dummy commit log body because I consider the change to trivial
to write something sensible.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/ata/ahci.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c31b337ba231..cea031af5a84 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -216,11 +216,7 @@ static int ahci_read_id(struct ata_port *ata, void *buf)
 	fis[1] = 1 << 7;		/* Command FIS. */
 	fis[2] = ATA_CMD_ID_ATA;	/* Command byte. */
 
-	ret = ahci_io(ahci, fis, sizeof(fis), buf, NULL, SECTOR_SIZE);
-	if (ret)
-		return ret;
-
-	return ret;
+	return ahci_io(ahci, fis, sizeof(fis), buf, NULL, SECTOR_SIZE);
 }
 
 static int ahci_rw(struct ata_port *ata, void *rbuf, const void *wbuf,
-- 
2.10.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH] fixup! ata/ahci: simplify ahci_read_id

[Uwe Kleine-König]

---
 drivers/ata/ahci.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index cea031af5a84..b4161059707d 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -207,7 +207,6 @@ static int ahci_read_id(struct ata_port *ata, void *buf)
 {
 	struct ahci_port *ahci = container_of(ata, struct ahci_port, ata);
 	u8 fis[20];
-	int ret;
 
 	memset(fis, 0, sizeof(fis));
 
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ata/ahci: simplify ahci_read_id

[Sascha Hauer]

On Sat, Dec 17, 2016 at 09:46:44PM +0100, Uwe Kleine-König wrote:
> This is a dummy commit log body because I consider the change to trivial
> to write something sensible.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---

Applied, thanks

Sascha

>  drivers/ata/ahci.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index c31b337ba231..cea031af5a84 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -216,11 +216,7 @@ static int ahci_read_id(struct ata_port *ata, void *buf)
>  	fis[1] = 1 << 7;		/* Command FIS. */
>  	fis[2] = ATA_CMD_ID_ATA;	/* Command byte. */
>  
> -	ret = ahci_io(ahci, fis, sizeof(fis), buf, NULL, SECTOR_SIZE);
> -	if (ret)
> -		return ret;
> -
> -	return ret;
> +	return ahci_io(ahci, fis, sizeof(fis), buf, NULL, SECTOR_SIZE);
>  }
>  
>  static int ahci_rw(struct ata_port *ata, void *rbuf, const void *wbuf,
> -- 
> 2.10.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox