staging: mt7621-mmc: Replace macro sdr_set_field with function

Currently sdr_set_field is a macro, to bring the code in line with the
upstream driver mtk-sd, it is changed to a function.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-mmc/mt6575_sd.h b/drivers/staging/mt7621-mmc/mt6575_sd.h
index 5a50b6a47469fd60ed69fb5caa44b1f306869e54..90b4ee6b396b9bf2cf7c566b7db1bad98616d9b1 100644 (file)
--- a/drivers/staging/mt7621-mmc/mt6575_sd.h
+++ b/drivers/staging/mt7621-mmc/mt6575_sd.h
@@ -971,13 +971,15 @@ static inline void sdr_clr_bits(void __iomem *reg, u32 bs)
        writel(val, reg);
 }
 
-#define sdr_set_field(reg, field, val)                                 \
-do {                                                           \
-       volatile unsigned int tv = sdr_read32(reg);                     \
-       tv &= ~(field);                                                 \
-       tv |= ((val) << (ffs((unsigned int)field) - 1));                \
-       sdr_write32(reg, tv);                                           \
-} while (0)
+static inline void sdr_set_field(void __iomem *reg, u32 field, u32 val)
+{
+       unsigned int tv = readl(reg);
+
+       tv &= ~field;
+       tv |= ((val) << (ffs((unsigned int)field) - 1));
+       writel(tv, reg);
+}
+
 #define sdr_get_field(reg, field, val)                                 \
 do {                                                           \
        volatile unsigned int tv = sdr_read32(reg);                     \