]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
regmap: mmio: Add regmap_mmio_get_min_stride
authorXiubo Li <lixiubo@cmss.chinamobile.com>
Thu, 3 Dec 2015 05:27:21 +0000 (13:27 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 8 Dec 2015 17:05:50 +0000 (17:05 +0000)
Splite the minimal stride parsing into one signal function.

Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/base/regmap/regmap-mmio.c

index dc991c3bec257774253b0151534bd06bf7ceb024..8812bfb9e3b89256f4a5d1468cf45484b18e4cd1 100644 (file)
@@ -61,6 +61,33 @@ static int regmap_mmio_regbits_check(size_t reg_bits)
        }
 }
 
+static int regmap_mmio_get_min_stride(size_t val_bits)
+{
+       int min_stride;
+
+       switch (val_bits) {
+       case 8:
+               /* The core treats 0 as 1 */
+               min_stride = 0;
+               return 0;
+       case 16:
+               min_stride = 2;
+               break;
+       case 32:
+               min_stride = 4;
+               break;
+#ifdef CONFIG_64BIT
+       case 64:
+               min_stride = 8;
+               break;
+#endif
+       default:
+               return -EINVAL;
+       }
+
+       return min_stride;
+}
+
 static inline void regmap_mmio_count_check(size_t count, u32 offset)
 {
        BUG_ON(count <= offset);
@@ -231,25 +258,9 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
        if (config->pad_bits)
                return ERR_PTR(-EINVAL);
 
-       switch (config->val_bits) {
-       case 8:
-               /* The core treats 0 as 1 */
-               min_stride = 0;
-               break;
-       case 16:
-               min_stride = 2;
-               break;
-       case 32:
-               min_stride = 4;
-               break;
-#ifdef CONFIG_64BIT
-       case 64:
-               min_stride = 8;
-               break;
-#endif
-       default:
-               return ERR_PTR(-EINVAL);
-       }
+       min_stride = regmap_mmio_get_min_stride(config->val_bits);
+       if (min_stride < 0)
+               return ERR_PTR(min_stride);
 
        if (config->reg_stride < min_stride)
                return ERR_PTR(-EINVAL);