regmap: Remove the redundant config to select hwspinlock

The hwspinlock was changed to a bool by commit d048236dfdfe
("hwspinlock: Change hwspinlock to a bool"), so we do not need
the REGMAP_HWSPINLOCK config to select hwspinlock or not.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index 3a1535d812d8c9d393338c30444cc64bb7d09651..0368fd7b3a414796f78db5e5d91788a3069358ca 100644 (file)
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -6,7 +6,6 @@
 config REGMAP
        default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)
        select IRQ_DOMAIN if REGMAP_IRQ
-       select REGMAP_HWSPINLOCK if HWSPINLOCK=y
        bool
 
 config REGCACHE_COMPRESSED
@@ -38,6 +37,3 @@ config REGMAP_MMIO
 
 config REGMAP_IRQ
        bool
-
-config REGMAP_HWSPINLOCK
-       bool

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 8d516a9bfc01722567588523b92e7fdcc2b75339..f25ab18ca0571600ae04a0cfa7d6b90d09212cad 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -414,7 +414,6 @@ static unsigned int regmap_parse_64_native(const void *buf)
 }
 #endif
 
-#ifdef REGMAP_HWSPINLOCK
 static void regmap_lock_hwlock(void *__map)
 {
        struct regmap *map = __map;
@@ -457,7 +456,6 @@ static void regmap_unlock_hwlock_irqrestore(void *__map)
 
        hwspin_unlock_irqrestore(map->hwlock, &map->spinlock_flags);
 }
-#endif
 
 static void regmap_lock_mutex(void *__map)
 {
@@ -674,7 +672,6 @@ struct regmap *__regmap_init(struct device *dev,
                map->unlock = config->unlock;
                map->lock_arg = config->lock_arg;
        } else if (config->hwlock_id) {
-#ifdef REGMAP_HWSPINLOCK
                map->hwlock = hwspin_lock_request_specific(config->hwlock_id);
                if (!map->hwlock) {
                        ret = -ENXIO;
@@ -697,10 +694,6 @@ struct regmap *__regmap_init(struct device *dev,
                }
 
                map->lock_arg = map;
-#else
-               ret = -EINVAL;
-               goto err_map;
-#endif
        } else {
                if ((bus && bus->fast_io) ||
                    config->fast_io) {
@@ -1116,7 +1109,7 @@ err_range:
        regmap_range_exit(map);
        kfree(map->work_buf);
 err_hwlock:
-       if (IS_ENABLED(REGMAP_HWSPINLOCK) && map->hwlock)
+       if (map->hwlock)
                hwspin_lock_free(map->hwlock);
 err_map:
        kfree(map);
@@ -1305,7 +1298,7 @@ void regmap_exit(struct regmap *map)
                kfree(async->work_buf);
                kfree(async);
        }
-       if (IS_ENABLED(REGMAP_HWSPINLOCK) && map->hwlock)
+       if (map->hwlock)
                hwspin_lock_free(map->hwlock);
        kfree(map);
 }