Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / scsi / mvsas / mv_94xx.h

diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
index 8f7eb4f..487aa6f 100644 (file)
--- a/drivers/scsi/mvsas/mv_94xx.h
+++ b/drivers/scsi/mvsas/mv_94xx.h
@@ -258,21 +258,11 @@ enum sas_sata_phy_regs {
 #define SPI_ADDR_VLD_94XX              (1U << 1)
 #define SPI_CTRL_SpiStart_94XX         (1U << 0)
 
-#define mv_ffc(x)   ffz(x)
-
 static inline int
 mv_ffc64(u64 v)
 {
-       int i;
-       i = mv_ffc((u32)v);
-       if (i >= 0)
-               return i;
-       i = mv_ffc((u32)(v>>32));
-
-       if (i != 0)
-               return 32 + i;
-
-       return -1;
+       u64 x = ~v;
+       return x ? __ffs64(x) : -1;
 }
 
 #define r_reg_set_enable(i) \