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

Timestamp:

Jan 24, 2021, 9:18:35 AM (5 years ago)

Author:

Paul Smedley

Message:

Fix warnings

File:

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

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

@@ -460 +460 @@
 static void regmap_lock_hwlock(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_lock_timeout(map->hwlock, UINT_MAX);
+        hwspin_lock_timeout(map->hwlock, UINT_MAX);
+#endif
 }
 
 static void regmap_lock_hwlock_irq(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_lock_timeout_irq(map->hwlock, UINT_MAX);
+        hwspin_lock_timeout_irq(map->hwlock, UINT_MAX);
+#endif
 }
 
 static void regmap_lock_hwlock_irqsave(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_lock_timeout_irqsave(map->hwlock, UINT_MAX,
-//                                  &map->spinlock_flags);
+        hwspin_lock_timeout_irqsave(map->hwlock, UINT_MAX,
+                                    &map->spinlock_flags);
+#endif
 }
 
 static void regmap_unlock_hwlock(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_unlock(map->hwlock);
+        hwspin_unlock(map->hwlock);
+#endif
 }
 
 static void regmap_unlock_hwlock_irq(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_unlock_irq(map->hwlock);
+        hwspin_unlock_irq(map->hwlock);
+#endif
 }
 
 static void regmap_unlock_hwlock_irqrestore(void *__map)
 {
+#ifndef TARGET_OS2
         struct regmap *map = __map;
 
-//      hwspin_unlock_irqrestore(map->hwlock, &map->spinlock_flags);
+        hwspin_unlock_irqrestore(map->hwlock, &map->spinlock_flags);
+#endif
 }
 
@@ -685 +697 @@
 #ifndef TARGET_OS2
         struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;
-#else
-        struct fwnode_handle *fwnode = NULL;
 #endif
         enum regmap_endian endian;
@@ -1230 +1240 @@
         if (map->hwlock)
                 hwspin_lock_free(map->hwlock);
-#endif
 err_name:
-#ifndef TARGET_OS2
         kfree_const(map->name);
-#else
-        kfree(map->name);
 #endif
 err_map:
@@ -2359 +2365 @@
         kfree(buf);
 
+#ifndef TARGET_OS2
         for (i = 0; i < num_regs; i++) {
                 int reg = regs[i].reg;
-        }
+                trace_regmap_hw_write_done(map, reg, 1);
+        }
+#endif
         return ret;
 }
@@ -3171 +3180 @@
 EXPORT_SYMBOL_GPL(regmap_async_complete_cb);
 
+#ifndef TARGET_OS2
 static int regmap_async_is_done(struct regmap *map)
 {
@@ -3182 +3192 @@
         return ret;
 }
+#endif
 
 /**