ARM : Add GPIO Driver and IOMUX definition for S3C2440

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

diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c
index 549de31235b465fe2172e826e8e638fb1b598266..1c3ab8a7333906e3e7fca1f2dd7219a951a45719 100644 (file)
--- a/drivers/block/ata_piix.c
+++ b/drivers/block/ata_piix.c
@@ -204,9 +204,6 @@ init_sata (int dev)
                                dev_print (&sata_dev_desc[devno]);
                                /* initialize partition type */
                                init_part (&sata_dev_desc[devno]);
-                               if (sata_curr_device < 0)
-                                       sata_curr_device =
-                                           i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
                        }
                }
        }
@@ -310,7 +307,7 @@ sata_bus_softreset (int num)
        }
 
        if (status & ATA_BUSY)
-               printf ("ata%u is slow to respond,plz be patient\n", port);
+               printf ("ata%u is slow to respond,plz be patient\n", num);
 
        while ((status & ATA_BUSY)) {
                msleep (100);
@@ -318,7 +315,7 @@ sata_bus_softreset (int num)
        }
 
        if (status & ATA_BUSY) {
-               printf ("ata%u failed to respond : ", port);
+               printf ("ata%u failed to respond : ", num);
                printf ("bus reset failed\n");
                return 1;
        }
@@ -389,11 +386,11 @@ sata_identify (int num, int dev)
                return;
        }
 
-       sata_cpy (sata_dev_desc[devno].revision, iop->fw_rev,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].revision, iop->fw_rev,
                  sizeof (sata_dev_desc[devno].revision));
-       sata_cpy (sata_dev_desc[devno].vendor, iop->model,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].vendor, iop->model,
                  sizeof (sata_dev_desc[devno].vendor));
-       sata_cpy (sata_dev_desc[devno].product, iop->serial_no,
+       sata_cpy ((unsigned char *)sata_dev_desc[devno].product, iop->serial_no,
                  sizeof (sata_dev_desc[devno].product));
        strswab (sata_dev_desc[devno].revision);
        strswab (sata_dev_desc[devno].vendor);