driver: net: fm: minor fix in DM ETH support

[oweals/u-boot.git] / drivers / block / ide.c

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 9ab01a9861fa9d6600d270f0c9ce6918301df8bb..67cc4fbc02eee2de58600a40764e9aaf58d9451a 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -232,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;
@@ -571,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
@@ -583,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
@@ -967,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 */
@@ -1170,8 +1169,6 @@ static int ide_blk_probe(struct udevice *udev)
                BLK_REV_SIZE);
        desc->revision[BLK_REV_SIZE] = '\0';
 
-       part_init(desc);
-
        return 0;
 }