libata-sff: use ATAPI_{COD|IO}
Sergei Shtylyov [Fri, 2 Dec 2011 15:39:53 +0000 (18:39 +0300)]
atapi_pio_bytes() uses bare numbers for the ATAPI interrupt reason bits despite
these are #define'd in <linux/ata.h>.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

drivers/ata/libata-sff.c

index 4cadfa2..9691dd0 100644 (file)
@@ -929,11 +929,11 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
        bytes = (bc_hi << 8) | bc_lo;
 
        /* shall be cleared to zero, indicating xfer of data */
-       if (unlikely(ireason & (1 << 0)))
+       if (unlikely(ireason & ATAPI_COD))
                goto atapi_check;
 
        /* make sure transfer direction matches expected */
-       i_write = ((ireason & (1 << 1)) == 0) ? 1 : 0;
+       i_write = ((ireason & ATAPI_IO) == 0) ? 1 : 0;
        if (unlikely(do_write != i_write))
                goto atapi_check;