Changeset 718 for GPL/branches/uniaud32-next/include/linux/device.h

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/include/linux/device.h (modified) (4 diffs)

GPL/branches/uniaud32-next/include/linux/device.h

@@ -92 +92 @@
 static inline const char *dev_name(const struct device *dev)
 {
+#if 0
         /* Use the init name until the kobject becomes available */
         if (dev->init_name)
@@ -97 +98 @@
 
         return kobject_name(&dev->kobj);
+#else
+        return "uniaud32";
+#endif
 }
 
@@ -218 +222 @@
 typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data);
 
+#define NUMA_NO_NODE    (-1)
+#if 0
 extern void *devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,
                                int nid);
-#define NUMA_NO_NODE    (-1)
 static inline void *devres_alloc(dr_release_t release, size_t size, gfp_t gfp)
 {
         return devres_alloc_node(release, size, gfp, NUMA_NO_NODE);
 }
-
+#else
+void *__devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,
+                          int nid, const char *name);
+#define devres_alloc(release, size, gfp) \
+        __devres_alloc_node(release, size, gfp, NUMA_NO_NODE, #release)
+#endif
 /**
  * struct class - device classes
@@ -290 +300 @@
 /* debugging and troubleshooting/diagnostic helpers. */
 extern const char *dev_driver_string(const struct device *dev);
-#define devm_kzalloc(A, B, C) kzalloc(B, C)
-#define devm_kmalloc(A, B, C) kmalloc(B, C)
-#define devm_kcalloc(A, B, C, D) kmalloc(B, C)
-#define devm_kmalloc_array(A, B, C, D) kmalloc_array(B, C, D)
-
+void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
+
+static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
+{
+        return devm_kmalloc(dev, size, gfp | __GFP_ZERO);
+}
+
+static inline void *devm_kmalloc_array(struct device *dev,
+                                       size_t n, size_t size, gfp_t flags)
+{
+//      size_t bytes;
+
+//      if (unlikely(check_mul_overflow(n, size, &bytes)))
+//              return NULL;
+
+        return devm_kmalloc(dev, n * size, flags);
+}
+static inline void *devm_kcalloc(struct device *dev,
+                                 size_t n, size_t size, gfp_t flags)
+{
+        return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);
+}
 
 /* allows to add/remove a custom action to devres stack */
 int devm_add_action(struct device *dev, void (*action)(void *), void *data);
 void devm_remove_action(struct device *dev, void (*action)(void *), void *data);
+
+static inline int dev_to_node(struct device *dev)
+{
+        return NUMA_NO_NODE;
+}
 #endif /* _LINUX_DEVICE_H */