Changeset 625 for GPL/branches/uniaud32-next/lib32/internal.h

Timestamp:

Jan 3, 2021, 7:20:20 AM (5 years ago)

Author:

Paul Smedley

Message:

Code cleanups to simplify future maintenance, update regmap/regcache/rbtree to linux 4.19.163 level

File:

• GPL/branches/uniaud32-next/lib32/internal.h (modified) (6 diffs)

GPL/branches/uniaud32-next/lib32/internal.h

@@ -10 +10 @@
  * published by the Free Software Foundation.
  */
-/* from 4.14.202 */
+/* from 4.19.163 */
 
 #ifndef _REGMAP_INTERNAL_H
@@ -82 +82 @@
 
 #ifdef CONFIG_DEBUG_FS
+        bool debugfs_disable;
         struct dentry *debugfs;
         const char *debugfs_name;
@@ -98 +99 @@
         bool (*volatile_reg)(struct device *dev, unsigned int reg);
         bool (*precious_reg)(struct device *dev, unsigned int reg);
+        bool (*readable_noinc_reg)(struct device *dev, unsigned int reg);
         const struct regmap_access_table *wr_table;
         const struct regmap_access_table *rd_table;
         const struct regmap_access_table *volatile_table;
         const struct regmap_access_table *precious_table;
+        const struct regmap_access_table *rd_noinc_table;
 
         int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
@@ -162 +165 @@
         struct rb_root range_tree;
         void *selector_work_buf;        /* Scratch buffer used for selector */
+
+        struct hwspinlock *hwlock;
 };
 
@@ -183 +188 @@
 bool regmap_volatile(struct regmap *map, unsigned int reg);
 bool regmap_precious(struct regmap *map, unsigned int reg);
+bool regmap_readable_noinc(struct regmap *map, unsigned int reg);
 
 int _regmap_write(struct regmap *map, unsigned int reg,
@@ -218 +224 @@
 extern void regmap_debugfs_init(struct regmap *map, const char *name);
 extern void regmap_debugfs_exit(struct regmap *map);
+
+static inline void regmap_debugfs_disable(struct regmap *map)
+{
+        map->debugfs_disable = true;
+}
+
 #else
 static inline void regmap_debugfs_initcall(void) { }
 static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
 static inline void regmap_debugfs_exit(struct regmap *map) { }
+static inline void regmap_debugfs_disable(struct regmap *map) { }
 #endif