[PATCH 0/2] block: ide: remove duplicate defines form include/ata.h

[PATCH 0/2] block: ide: remove duplicate defines form include/ata.h

[Heinrich Schuchardt]

This patchset is about removing duplicate constants.

In drivers/block/ide.c use constants from include/libata.h.
In include/ata.h remove constants duplicating constants from
include/libata.h.

Heinrich Schuchardt (2):
  block: ide: use definitions from include/libata.h
  ide: remove duplicate defines form include/ata.h

 drivers/block/ide.c |  8 ++++----
 include/ata.h       | 34 ----------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

--
2.25.0

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

[Heinrich Schuchardt]

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(-)

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 */
--
2.25.0

[PATCH 2/2] ide: remove duplicate defines form include/ata.h

[Heinrich Schuchardt]

ATA commands are already defined in include/libata.h. There is no need to
duplicate them in include/ata.h.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 include/ata.h | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/include/ata.h b/include/ata.h
index 3f4e4a0234..e35d91941d 100644
--- a/include/ata.h
+++ b/include/ata.h
@@ -70,43 +70,9 @@
 #endif /* ATA_DEVICE */
 #define ATA_LBA		0xE0

-/*
- * ATA Commands (only mandatory commands listed here)
- */
-#define ATA_CMD_READ	0x20	/* Read Sectors (with retries)	*/
-#define ATA_CMD_READN	0x21	/* Read Sectors ( no  retries)	*/
-#define ATA_CMD_WRITE	0x30	/* Write Sectores (with retries)*/
-#define ATA_CMD_WRITEN	0x31	/* Write Sectors  ( no  retries)*/
-#define ATA_CMD_VRFY	0x40	/* Read Verify  (with retries)	*/
-#define ATA_CMD_VRFYN	0x41	/* Read verify  ( no  retries)	*/
-#define ATA_CMD_SEEK	0x70	/* Seek				*/
-#define ATA_CMD_DIAG	0x90	/* Execute Device Diagnostic	*/
-#define ATA_CMD_INIT	0x91	/* Initialize Device Parameters	*/
-#define ATA_CMD_RD_MULT	0xC4	/* Read Multiple		*/
-#define ATA_CMD_WR_MULT	0xC5	/* Write Multiple		*/
-#define ATA_CMD_SETMULT	0xC6	/* Set Multiple Mode		*/
-#define ATA_CMD_RD_DMA	0xC8	/* Read DMA (with retries)	*/
-#define ATA_CMD_RD_DMAN	0xC9	/* Read DMS ( no  retries)	*/
-#define ATA_CMD_WR_DMA	0xCA	/* Write DMA (with retries)	*/
-#define ATA_CMD_WR_DMAN	0xCB	/* Write DMA ( no  retires)	*/
-#define ATA_CMD_IDENT	0xEC	/* Identify Device		*/
-#define ATA_CMD_SETF	0xEF	/* Set Features			*/
-#define ATA_CMD_CHK_PWR	0xE5	/* Check Power Mode		*/
-
-#define ATA_CMD_READ_EXT 0x24	/* Read Sectors (with retries)	with 48bit addressing */
-#define ATA_CMD_WRITE_EXT	0x34	/* Write Sectores (with retries) with 48bit addressing */
-#define ATA_CMD_VRFY_EXT	0x42	/* Read Verify	(with retries)	with 48bit addressing */
-
-#define ATA_CMD_FLUSH 0xE7 /* Flush drive cache */
-#define ATA_CMD_FLUSH_EXT 0xEA /* Flush drive cache, with 48bit addressing */
-
 /*
  * ATAPI Commands
  */
-#define ATAPI_CMD_IDENT 0xA1 /* Identify AT Atachment Packed Interface Device */
-#define ATAPI_CMD_PACKET 0xA0 /* Packed Command */
-
-
 #define ATAPI_CMD_INQUIRY 0x12
 #define ATAPI_CMD_REQ_SENSE 0x03
 #define ATAPI_CMD_READ_CAP 0x25
--
2.25.0

[PATCH 2/2] ide: remove duplicate defines form include/ata.h

[Simon Glass]

On Thu, 27 Feb 2020 at 09:28, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> ATA commands are already defined in include/libata.h. There is no need to
> duplicate them in include/ata.h.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  include/ata.h | 34 ----------------------------------
>  1 file changed, 34 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

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

[Simon Glass]

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>

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

[Tom Rini]

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!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200421/00951da4/attachment.sig>

[PATCH 2/2] ide: remove duplicate defines form include/ata.h

[Tom Rini]

On Thu, Feb 27, 2020 at 06:28:01PM +0100, Heinrich Schuchardt wrote:

> ATA commands are already defined in include/libata.h. There is no need to
> duplicate them in include/ata.h.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200421/6b503406/attachment.sig>