Changeset 718 for GPL/branches/uniaud32-next/lib32/regmap.c

Timestamp:

Sep 2, 2022, 4:26:36 AM (3 years ago)

Author:

Paul Smedley

Message:

WIP trying to fix non-HDA Hardware

File:

• GPL/branches/uniaud32-next/lib32/regmap.c (modified) (61 diffs)

GPL/branches/uniaud32-next/lib32/regmap.c

@@ -45 +45 @@
 
 #ifdef LOG_DEVICE
-static inline bool regmap_should_log(struct regmap *map)
+/*static*/ inline bool regmap_should_log(struct regmap *map)
 {
         return (map->dev && strcmp(dev_name(map->dev), LOG_DEVICE) == 0);
 }
 #else
-static inline bool regmap_should_log(struct regmap *map) { return false; }
-#endif
-
-
-static int _regmap_update_bits(struct regmap *map, unsigned int reg,
+/*static*/ inline bool regmap_should_log(struct regmap *map) { return false; }
+#endif
+
+
+/*static*/ int _regmap_update_bits(struct regmap *map, unsigned int reg,
                                unsigned int mask, unsigned int val,
                                bool *change, bool force_write);
 
-static int _regmap_bus_reg_read(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_reg_read(void *context, unsigned int reg,
                                 unsigned int *val);
-static int _regmap_bus_read(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_read(void *context, unsigned int reg,
                             unsigned int *val);
-static int _regmap_bus_formatted_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_formatted_write(void *context, unsigned int reg,
                                        unsigned int val);
-static int _regmap_bus_reg_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_reg_write(void *context, unsigned int reg,
                                  unsigned int val);
-static int _regmap_bus_raw_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_raw_write(void *context, unsigned int reg,
                                  unsigned int val);
 
@@ -209 +209 @@
 }
 
-static bool regmap_volatile_range(struct regmap *map, unsigned int reg,
+/*static*/ bool regmap_volatile_range(struct regmap *map, unsigned int reg,
         size_t num)
 {
@@ -221 +221 @@
 }
 
-static void regmap_format_12_20_write(struct regmap *map,
+/*static*/ void regmap_format_12_20_write(struct regmap *map,
                                      unsigned int reg, unsigned int val)
 {
@@ -233 +233 @@
 
 
-static void regmap_format_2_6_write(struct regmap *map,
+/*static*/ void regmap_format_2_6_write(struct regmap *map,
                                      unsigned int reg, unsigned int val)
 {
@@ -241 +241 @@
 }
 
-static void regmap_format_4_12_write(struct regmap *map,
+/*static*/ void regmap_format_4_12_write(struct regmap *map,
                                      unsigned int reg, unsigned int val)
 {
@@ -248 +248 @@
 }
 
-static void regmap_format_7_9_write(struct regmap *map,
+/*static*/ void regmap_format_7_9_write(struct regmap *map,
                                     unsigned int reg, unsigned int val)
 {
@@ -255 +255 @@
 }
 
-static void regmap_format_10_14_write(struct regmap *map,
+/*static*/ void regmap_format_10_14_write(struct regmap *map,
                                     unsigned int reg, unsigned int val)
 {
@@ -265 +265 @@
 }
 
-static void regmap_format_8(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_8(void *buf, unsigned int val, unsigned int shift)
 {
         u8 *b = buf;
@@ -272 +272 @@
 }
 
-static void regmap_format_16_be(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_16_be(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_be16(val << shift, buf);
 }
 
-static void regmap_format_16_le(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_16_le(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_le16(val << shift, buf);
 }
 
-static void regmap_format_16_native(void *buf, unsigned int val,
+/*static*/ void regmap_format_16_native(void *buf, unsigned int val,
                                     unsigned int shift)
 {
@@ -290 +290 @@
 }
 
-static void regmap_format_24(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_24(void *buf, unsigned int val, unsigned int shift)
 {
         u8 *b = buf;
@@ -301 +301 @@
 }
 
-static void regmap_format_32_be(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_32_be(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_be32(val << shift, buf);
 }
 
-static void regmap_format_32_le(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_32_le(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_le32(val << shift, buf);
 }
 
-static void regmap_format_32_native(void *buf, unsigned int val,
+/*static*/ void regmap_format_32_native(void *buf, unsigned int val,
                                     unsigned int shift)
 {
@@ -320 +320 @@
 
 #ifdef CONFIG_64BIT
-static void regmap_format_64_be(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_64_be(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_be64((u64) val << shift, buf);
 }
 
-static void regmap_format_64_le(void *buf, unsigned int val, unsigned int shift)
+/*static*/ void regmap_format_64_le(void *buf, unsigned int val, unsigned int shift)
 {
         put_unaligned_le64((u64) val << shift, buf);
 }
 
-static void regmap_format_64_native(void *buf, unsigned int val,
+/*static*/ void regmap_format_64_native(void *buf, unsigned int val,
                                     unsigned int shift)
 {
@@ -339 +339 @@
 #endif
 
-static void regmap_parse_inplace_noop(void *buf)
-{
-}
-
-static unsigned int regmap_parse_8(const void *buf)
+/*static*/ void regmap_parse_inplace_noop(void *buf)
+{
+}
+
+/*static*/ unsigned int regmap_parse_8(const void *buf)
 {
         const u8 *b = buf;
@@ -350 +350 @@
 }
 
-static unsigned int regmap_parse_16_be(const void *buf)
+/*static*/ unsigned int regmap_parse_16_be(const void *buf)
 {
         return get_unaligned_be16(buf);
 }
 
-static unsigned int regmap_parse_16_le(const void *buf)
+/*static*/ unsigned int regmap_parse_16_le(const void *buf)
 {
         return get_unaligned_le16(buf);
 }
 
-static void regmap_parse_16_be_inplace(void *buf)
+/*static*/ void regmap_parse_16_be_inplace(void *buf)
 {
         u16 v = get_unaligned_be16(buf);
@@ -367 +367 @@
 }
 
-static void regmap_parse_16_le_inplace(void *buf)
+/*static*/ void regmap_parse_16_le_inplace(void *buf)
 {
         u16 v = get_unaligned_le16(buf);
@@ -374 +374 @@
 }
 
-static unsigned int regmap_parse_16_native(const void *buf)
+/*static*/ unsigned int regmap_parse_16_native(const void *buf)
 {
         u16 v;
@@ -382 +382 @@
 }
 
-static unsigned int regmap_parse_24(const void *buf)
+/*static*/ unsigned int regmap_parse_24(const void *buf)
 {
         const u8 *b = buf;
@@ -392 +392 @@
 }
 
-static unsigned int regmap_parse_32_be(const void *buf)
+/*static*/ unsigned int regmap_parse_32_be(const void *buf)
 {
         return get_unaligned_be32(buf);
 }
 
-static unsigned int regmap_parse_32_le(const void *buf)
+/*static*/ unsigned int regmap_parse_32_le(const void *buf)
 {
         return get_unaligned_le32(buf);
 }
 
-static void regmap_parse_32_be_inplace(void *buf)
+/*static*/ void regmap_parse_32_be_inplace(void *buf)
 {
         u32 v = get_unaligned_be32(buf);
@@ -409 +409 @@
 }
 
-static void regmap_parse_32_le_inplace(void *buf)
+/*static*/ void regmap_parse_32_le_inplace(void *buf)
 {
         u32 v = get_unaligned_le32(buf);
@@ -416 +416 @@
 }
 
-static unsigned int regmap_parse_32_native(const void *buf)
+/*static*/ unsigned int regmap_parse_32_native(const void *buf)
 {
         u32 v;
@@ -425 +425 @@
 
 #ifdef CONFIG_64BIT
-static unsigned int regmap_parse_64_be(const void *buf)
+/*static*/ unsigned int regmap_parse_64_be(const void *buf)
 {
         return get_unaligned_be64(buf);
 }
 
-static unsigned int regmap_parse_64_le(const void *buf)
+/*static*/ unsigned int regmap_parse_64_le(const void *buf)
 {
         return get_unaligned_le64(buf);
 }
 
-static void regmap_parse_64_be_inplace(void *buf)
+/*static*/ void regmap_parse_64_be_inplace(void *buf)
 {
         u64 v =  get_unaligned_be64(buf);
@@ -442 +442 @@
 }
 
-static void regmap_parse_64_le_inplace(void *buf)
+/*static*/ void regmap_parse_64_le_inplace(void *buf)
 {
         u64 v = get_unaligned_le64(buf);
@@ -449 +449 @@
 }
 
-static unsigned int regmap_parse_64_native(const void *buf)
+/*static*/ unsigned int regmap_parse_64_native(const void *buf)
 {
         u64 v;
@@ -458 +458 @@
 #endif
 
-static void regmap_lock_hwlock(void *__map)
+/*static*/ void regmap_lock_hwlock(void *__map)
 {
 #ifndef TARGET_OS2
@@ -467 +467 @@
 }
 
-static void regmap_lock_hwlock_irq(void *__map)
+/*static*/ void regmap_lock_hwlock_irq(void *__map)
 {
 #ifndef TARGET_OS2
@@ -476 +476 @@
 }
 
-static void regmap_lock_hwlock_irqsave(void *__map)
+/*static*/ void regmap_lock_hwlock_irqsave(void *__map)
 {
 #ifndef TARGET_OS2
@@ -486 +486 @@
 }
 
-static void regmap_unlock_hwlock(void *__map)
+/*static*/ void regmap_unlock_hwlock(void *__map)
 {
 #ifndef TARGET_OS2
@@ -495 +495 @@
 }
 
-static void regmap_unlock_hwlock_irq(void *__map)
+/*static*/ void regmap_unlock_hwlock_irq(void *__map)
 {
 #ifndef TARGET_OS2
@@ -504 +504 @@
 }
 
-static void regmap_unlock_hwlock_irqrestore(void *__map)
+/*static*/ void regmap_unlock_hwlock_irqrestore(void *__map)
 {
 #ifndef TARGET_OS2
@@ -513 +513 @@
 }
 
-static void regmap_lock_unlock_none(void *__map)
-{
-
-}
-
-static void regmap_lock_mutex(void *__map)
+/*static*/ void regmap_lock_unlock_none(void *__map)
+{
+
+}
+
+/*static*/ void regmap_lock_mutex(void *__map)
 {
         struct regmap *map = __map;
@@ -524 +524 @@
 }
 
-static void regmap_unlock_mutex(void *__map)
+/*static*/ void regmap_unlock_mutex(void *__map)
 {
         struct regmap *map = __map;
@@ -530 +530 @@
 }
 
-static void regmap_lock_spinlock(void *__map)
+/*static*/ void regmap_lock_spinlock(void *__map)
 __acquires(&map->spinlock)
 {
@@ -540 +540 @@
 }
 
-static void regmap_unlock_spinlock(void *__map)
+/*static*/ void regmap_unlock_spinlock(void *__map)
 __releases(&map->spinlock)
 {
@@ -547 +547 @@
 }
 
-static void dev_get_regmap_release(struct device *dev, void *res)
+/*static*/ void dev_get_regmap_release(struct device *dev, void *res)
 {
         /*
@@ -556 +556 @@
 }
 
-static bool _regmap_range_add(struct regmap *map,
+/*static*/ bool _regmap_range_add(struct regmap *map,
                               struct regmap_range_node *data)
 {
@@ -581 +581 @@
 }
 
-static struct regmap_range_node *_regmap_range_lookup(struct regmap *map,
+/*static*/ struct regmap_range_node *_regmap_range_lookup(struct regmap *map,
                                                       unsigned int reg)
 {
@@ -601 +601 @@
 }
 
-static void regmap_range_exit(struct regmap *map)
+/*static*/ void regmap_range_exit(struct regmap *map)
 {
         struct rb_node *next;
@@ -617 +617 @@
 }
 
-static int regmap_set_name(struct regmap *map, const struct regmap_config *config)
+/*static*/ int regmap_set_name(struct regmap *map, const struct regmap_config *config)
 {
         if (config->name) {
@@ -652 +652 @@
                 return ret;
 
+        regmap_debugfs_exit(map);
         regmap_debugfs_init(map);
 
@@ -667 +668 @@
 EXPORT_SYMBOL_GPL(regmap_attach_dev);
 
-static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
+/*static*/ enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
                                         const struct regmap_config *config)
 {
@@ -1251 +1252 @@
 
 #ifndef TARGET_OS2
-static void devm_regmap_release(struct device *dev, void *res)
+/*static*/ void devm_regmap_release(struct device *dev, void *res)
 {
         regmap_exit(*(struct regmap **)res);
@@ -1283 +1284 @@
 #endif
 
-static void regmap_field_init(struct regmap_field *rm_field,
+/*static*/ void regmap_field_init(struct regmap_field *rm_field,
         struct regmap *regmap, struct reg_field reg_field)
 {
@@ -1561 +1562 @@
 EXPORT_SYMBOL_GPL(regmap_exit);
 
-static int dev_get_regmap_match(struct device *dev, void *res, void *data)
+/*static*/ int dev_get_regmap_match(struct device *dev, void *res, void *data)
 {
         struct regmap **r = res;
@@ -1612 +1613 @@
 EXPORT_SYMBOL_GPL(regmap_get_device);
 
-static int _regmap_select_page(struct regmap *map, unsigned int *reg,
+/*static*/ int _regmap_select_page(struct regmap *map, unsigned int *reg,
                                struct regmap_range_node *range,
                                unsigned int val_num)
@@ -1660 +1661 @@
 }
 
-static void regmap_set_work_buf_flag_mask(struct regmap *map, int max_bytes,
+/*static*/ void regmap_set_work_buf_flag_mask(struct regmap *map, int max_bytes,
                                           unsigned long mask)
 {
@@ -1675 +1676 @@
 }
 
-static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
+/*static*/ int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
                                   const void *val, size_t val_len, bool noinc)
 {
@@ -1902 +1903 @@
 EXPORT_SYMBOL_GPL(regmap_get_raw_write_max);
 
-static int _regmap_bus_formatted_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_formatted_write(void *context, unsigned int reg,
                                        unsigned int val)
 {
@@ -1926 +1927 @@
 }
 
-static int _regmap_bus_reg_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_reg_write(void *context, unsigned int reg,
                                  unsigned int val)
 {
@@ -1934 +1935 @@
 }
 
-static int _regmap_bus_raw_write(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_raw_write(void *context, unsigned int reg,
                                  unsigned int val)
 {
@@ -1951 +1952 @@
 }
 
-static inline void *_regmap_map_get_context(struct regmap *map)
+/*static*/ inline void *_regmap_map_get_context(struct regmap *map)
 {
         return (map->bus) ? map : map->bus_context;
@@ -2325 +2326 @@
  * relative. The page register has been written if that was necessary.
  */
-static int _regmap_raw_multi_reg_write(struct regmap *map,
+/*static*/ int _regmap_raw_multi_reg_write(struct regmap *map,
                                        const struct reg_sequence *regs,
                                        size_t num_regs)
@@ -2374 +2375 @@
 }
 
-static unsigned int _regmap_register_page(struct regmap *map,
+/*static*/ unsigned int _regmap_register_page(struct regmap *map,
                                           unsigned int reg,
                                           struct regmap_range_node *range)
@@ -2383 +2384 @@
 }
 
-static int _regmap_range_multi_paged_reg_write(struct regmap *map,
+/*static*/ int _regmap_range_multi_paged_reg_write(struct regmap *map,
                                                struct reg_sequence *regs,
                                                size_t num_regs)
@@ -2466 +2467 @@
 }
 
-static int _regmap_multi_reg_write(struct regmap *map,
+/*static*/ int _regmap_multi_reg_write(struct regmap *map,
                                    const struct reg_sequence *regs,
                                    size_t num_regs)
@@ -2667 +2668 @@
 EXPORT_SYMBOL_GPL(regmap_raw_write_async);
 
-static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
+/*static*/ int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
                             unsigned int val_len, bool noinc)
 {
@@ -2697 +2698 @@
 }
 
-static int _regmap_bus_reg_read(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_reg_read(void *context, unsigned int reg,
                                 unsigned int *val)
 {
@@ -2705 +2706 @@
 }
 
-static int _regmap_bus_read(void *context, unsigned int reg,
+/*static*/ int _regmap_bus_read(void *context, unsigned int reg,
                             unsigned int *val)
 {
@@ -2723 +2724 @@
 }
 
-static int _regmap_read(struct regmap *map, unsigned int reg,
+/*static*/ int _regmap_read(struct regmap *map, unsigned int reg,
                         unsigned int *val)
 {
@@ -3064 +3065 @@
 EXPORT_SYMBOL_GPL(regmap_bulk_read);
 
-static int _regmap_update_bits(struct regmap *map, unsigned int reg,
+/*static*/ int _regmap_update_bits(struct regmap *map, unsigned int reg,
                                unsigned int mask, unsigned int val,
                                bool *change, bool force_write)
@@ -3181 +3182 @@
 
 #ifndef TARGET_OS2
-static int regmap_async_is_done(struct regmap *map)
+/*static*/ int regmap_async_is_done(struct regmap *map)
 {
         unsigned long flags;
@@ -3345 +3346 @@
 EXPORT_SYMBOL_GPL(regmap_parse_val);
 
-static int __init regmap_initcall(void)
+/*static*/ int __init regmap_initcall(void)
 {
         regmap_debugfs_initcall();