Merge branch 'topic/namespace' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

diff --combined include/linux/regmap.h
index 978abfb,6e1df5e..1474ab0
--- 1/include/linux/regmap.h
--- 2/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@ -120,23 -120,24 +120,24 @@@ struct reg_sequence 
   */
  #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \
  ({ \
-       ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
-       int pollret; \
+       ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \
+       int __ret; \
        might_sleep_if(sleep_us); \
        for (;;) { \
-               pollret = regmap_read((map), (addr), &(val)); \
-               if (pollret) \
+               __ret = regmap_read((map), (addr), &(val)); \
+               if (__ret) \
                        break; \
                if (cond) \
                        break; \
-               if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
-                       pollret = regmap_read((map), (addr), &(val)); \
+               if ((timeout_us) && \
+                   ktime_compare(ktime_get(), __timeout) > 0) { \
+                       __ret = regmap_read((map), (addr), &(val)); \
                        break; \
                } \
                if (sleep_us) \
-                       usleep_range((sleep_us >> 2) + 1, sleep_us); \
+                       usleep_range(((sleep_us) >> 2) + 1, sleep_us); \
        } \
-       pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
+       __ret ?: ((cond) ? 0 : -ETIMEDOUT); \
  })
  
  #ifdef CONFIG_REGMAP
@@@ -461,10 -462,6 +462,10 @@@ struct regmap *__regmap_init_spmi_ext(s
                                      const struct regmap_config *config,
                                      struct lock_class_key *lock_key,
                                      const char *lock_name);
 +struct regmap *__regmap_init_w1(struct device *w1_dev,
 +                               const struct regmap_config *config,
 +                               struct lock_class_key *lock_key,
 +                               const char *lock_name);
  struct regmap *__regmap_init_mmio_clk(struct device *dev, const char *clk_id,
                                      void __iomem *regs,
                                      const struct regmap_config *config,
@@@ -497,10 -494,6 +498,10 @@@ struct regmap *__devm_regmap_init_spmi_
                                           const struct regmap_config *config,
                                           struct lock_class_key *lock_key,
                                           const char *lock_name);
 +struct regmap *__devm_regmap_init_w1(struct device *w1_dev,
 +                                    const struct regmap_config *config,
 +                                    struct lock_class_key *lock_key,
 +                                    const char *lock_name);
  struct regmap *__devm_regmap_init_mmio_clk(struct device *dev,
                                           const char *clk_id,
                                           void __iomem *regs,
@@@ -604,19 -597,6 +605,19 @@@ int regmap_attach_dev(struct device *de
        __regmap_lockdep_wrapper(__regmap_init_spmi_ext, #config,       \
                                dev, config)
  
 +/**
 + * regmap_init_w1() - Initialise register map
 + *
 + * @w1_dev: Device that will be interacted with
 + * @config: Configuration for register map
 + *
 + * The return value will be an ERR_PTR() on error or a valid pointer to
 + * a struct regmap.
 + */
 +#define regmap_init_w1(w1_dev, config)                                        \
 +      __regmap_lockdep_wrapper(__regmap_init_w1, #config,             \
 +                              w1_dev, config)
 +
  /**
   * regmap_init_mmio_clk() - Initialise register map with register clock
   *
@@@ -732,19 -712,6 +733,19 @@@ bool regmap_ac97_default_volatile(struc
        __regmap_lockdep_wrapper(__devm_regmap_init_spmi_ext, #config,  \
                                dev, config)
  
 +/**
 + * devm_regmap_init_w1() - Initialise managed register map
 + *
 + * @w1_dev: Device that will be interacted with
 + * @config: Configuration for register map
 + *
 + * The return value will be an ERR_PTR() on error or a valid pointer
 + * to a struct regmap.  The regmap will be automatically freed by the
 + * device management code.
 + */
 +#define devm_regmap_init_w1(w1_dev, config)                           \
 +      __regmap_lockdep_wrapper(__devm_regmap_init_w1, #config,        \
 +                              w1_dev, config)
  /**
   * devm_regmap_init_mmio_clk() - Initialise managed register map with clock
   *
@@@ -918,7 -885,6 +919,7 @@@ struct regmap_irq 
   *
   * @status_base: Base status register address.
   * @mask_base:   Base mask register address.
 + * @mask_writeonly: Base mask register is write only.
   * @unmask_base:  Base unmask register address. for chips who have
   *                separate mask and unmask registers
   * @ack_base:    Base ack address. If zero then the chip is clear on read.
@@@ -962,7 -928,6 +963,7 @@@ struct regmap_irq_chip 
        unsigned int wake_base;
        unsigned int type_base;
        unsigned int irq_reg_stride;
 +      bool mask_writeonly:1;
        bool init_ack_masked:1;
        bool mask_invert:1;
        bool use_ack:1;