Changeset 772 for GPL/trunk/include/linux/device.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/device.h (modified) (7 diffs)

GPL/trunk/include/linux/device.h

@@ -42 +42 @@
 
         const struct dev_pm_ops *pm;
+};
+
+struct device_dma_parameters {
+        /*
+         * a low level driver may set these to teach IOMMU code about
+         * sg limitations.
+         */
+        unsigned int max_segment_size;
+        unsigned int min_align_mask;
+        unsigned long segment_boundary_mask;
 };
 
@@ -67 +77 @@
   void *platform_data;
   struct dev_pm_info    power;
+        struct device_dma_parameters *dma_parms;
   struct list_head      dma_pools;      /* dma pools (if dma'ble) */
   struct device_driver *driver;
+  void          *driver_data;   /* Driver data, set and get with
+                                           dev_set_drvdata/dev_get_drvdata */
   struct pm_dev *pm_dev;
   char  bus_id[20];
-  struct class          *class;
+  const struct class            *class;
   spinlock_t            devres_lock;
   struct list_head      devres_head;
@@ -92 +105 @@
 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 +111 @@
 
         return kobject_name(&dev->kobj);
+#else
+        return "uniaud32";
+#endif
 }
 
@@ -146 +163 @@
                                          struct bus_type *bus);
 
-#define dev_set_drvdata(dev,ptr)        ((dev)->private_data = (ptr))
-#define dev_get_drvdata(dev)    (dev)->private_data
-
 #define MODULE_ALIAS_CHARDEV_MAJOR(x)
 
@@ -218 +232 @@
 typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data);
 
-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);
-}
+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)
 
 /**
@@ -288 +300 @@
                          dr_match_t match, void *match_data);
 
+/* devres group */
+void * __must_check devres_open_group(struct device *dev, void *id, gfp_t gfp);
+void devres_close_group(struct device *dev, void *id);
+void devres_remove_group(struct device *dev, void *id);
+int devres_release_group(struct device *dev, void *id);
+
 /* 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;
+}
+
+static inline void *dev_get_drvdata(const struct device *dev)
+{
+        return dev->driver_data;
+}
+
+static inline void dev_set_drvdata(struct device *dev, void *data)
+{
+        dev->driver_data = data;
+}
+
+/* Generic device matching functions that all busses can use to match with */
+int device_match_name(struct device *dev, const void *name);
+int device_match_of_node(struct device *dev, const void *np);
+
+char *devm_kasprintf(struct device *dev, gfp_t gfp,
+                                    const char *fmt, ...);
+
 #endif /* _LINUX_DEVICE_H */