diff options
Diffstat (limited to 'drivers/ata/pata_bf54x.c')
-rw-r--r-- | drivers/ata/pata_bf54x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index 9cae65de750e..ec2c777fcdb0 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -826,7 +826,7 @@ static void bfin_dev_select(struct ata_port *ap, unsigned int device) | |||
826 | * @ctl: value to write | 826 | * @ctl: value to write |
827 | */ | 827 | */ |
828 | 828 | ||
829 | static u8 bfin_set_devctl(struct ata_port *ap, u8 ctl) | 829 | static void bfin_set_devctl(struct ata_port *ap, u8 ctl) |
830 | { | 830 | { |
831 | void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; | 831 | void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr; |
832 | write_atapi_register(base, ATA_REG_CTRL, ctl); | 832 | write_atapi_register(base, ATA_REG_CTRL, ctl); |
@@ -1046,7 +1046,7 @@ static void bfin_bus_post_reset(struct ata_port *ap, unsigned int devmask) | |||
1046 | dev1 = 0; | 1046 | dev1 = 0; |
1047 | break; | 1047 | break; |
1048 | } | 1048 | } |
1049 | msleep(50); /* give drive a breather */ | 1049 | ata_msleep(ap, 50); /* give drive a breather */ |
1050 | } | 1050 | } |
1051 | if (dev1) | 1051 | if (dev1) |
1052 | ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT); | 1052 | ata_sff_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT); |
@@ -1087,7 +1087,7 @@ static unsigned int bfin_bus_softreset(struct ata_port *ap, | |||
1087 | * | 1087 | * |
1088 | * Old drivers/ide uses the 2mS rule and then waits for ready | 1088 | * Old drivers/ide uses the 2mS rule and then waits for ready |
1089 | */ | 1089 | */ |
1090 | msleep(150); | 1090 | ata_msleep(ap, 150); |
1091 | 1091 | ||
1092 | /* Before we perform post reset processing we want to see if | 1092 | /* Before we perform post reset processing we want to see if |
1093 | * the bus shows 0xFF because the odd clown forgets the D7 | 1093 | * the bus shows 0xFF because the odd clown forgets the D7 |