diff mbox series

[1/2] block: ide: use definitions from include/libata.h

Message ID 20200227172801.3126-2-xypron.glpk@gmx.de
State Accepted
Commit e6e9a4f0a9e74a079c10f7650c0386ee49e04e44
Delegated to: Tom Rini
Headers show
Series block: ide: remove duplicate defines form include/ata.h | expand

Commit Message

Heinrich Schuchardt Feb. 27, 2020, 5:28 p.m. UTC 
Currently ATA commands are defined both in include/libata.h and
include/ata.h. Use the command definitions from include/libata.h where
applicable.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
Resent
---
 drivers/block/ide.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--
2.25.0

Comments

Simon Glass Feb. 27, 2020, 11:40 p.m. UTC | #1 
On Thu, 27 Feb 2020 at 09:28, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> Currently ATA commands are defined both in include/libata.h and
> include/ata.h. Use the command definitions from include/libata.h where
> applicable.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> Resent
> ---
>  drivers/block/ide.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini April 21, 2020, 12:26 p.m. UTC | #2 
On Thu, Feb 27, 2020 at 06:28:00PM +0100, Heinrich Schuchardt wrote:

> Currently ATA commands are defined both in include/libata.h and
> include/ata.h. Use the command definitions from include/libata.h where
> applicable.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 4b8a4eac17..67cc4fbc02 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -231,7 +231,7 @@  unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
 		 (unsigned char) ((buflen >> 8) & 0xFF));
 	ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));

-	ide_outb(device, ATA_COMMAND, ATAPI_CMD_PACKET);
+	ide_outb(device, ATA_COMMAND, ATA_CMD_PACKET);
 	udelay(50);

 	mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
@@ -570,7 +570,7 @@  static void ide_ident(struct blk_desc *dev_desc)
 			/*
 			 * Start Ident Command
 			 */
-			ide_outb(device, ATA_COMMAND, ATAPI_CMD_IDENT);
+			ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATAPI);
 			/*
 			 * Wait for completion - ATAPI devices need more time
 			 * to become ready
@@ -582,7 +582,7 @@  static void ide_ident(struct blk_desc *dev_desc)
 			/*
 			 * Start Ident Command
 			 */
-			ide_outb(device, ATA_COMMAND, ATA_CMD_IDENT);
+			ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATA);

 			/*
 			 * Wait for completion
@@ -966,7 +966,7 @@  ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,

 	/* first check if the drive is in Powersaving mode, if yes,
 	 * increase the timeout value */
-	ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_PWR);
+	ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_POWER);
 	udelay(50);

 	c = ide_wait(device, IDE_TIME_OUT);	/* can't take over 500 ms */