HID: roccat: don't use #pragma pack

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_scc.c

diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index fe36966f7e347dedd4781cef96fcec5ff79e62f3..093715c3273a9fd0fa00cec911f83972710615fa 100644 (file)
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -530,7 +530,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,
         *
         * Old drivers/ide uses the 2mS rule and then waits for ready.
         */
-       msleep(150);
+       ata_msleep(ap, 150);
 
        /* always check readiness of the master device */
        rc = ata_sff_wait_ready(link, deadline);
@@ -559,7 +559,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,
                        lbal = in_be32(ioaddr->lbal_addr);
                        if ((nsect == 1) && (lbal == 1))
                                break;
-                       msleep(50);     /* give drive a breather */
+                       ata_msleep(ap, 50);     /* give drive a breather */
                }
 
                rc = ata_sff_wait_ready(link, deadline);