Changeset 719

Timestamp:

Sep 3, 2022, 11:33:40 AM (3 years ago)

Author:

Paul Smedley

Message:

Tidy ups, and fix non-HDA hardware

Location:

GPL/branches/uniaud32-next

Files:

• include/linux/device.h (modified) (1 diff)
• lib32/devres.c (modified) (1 diff)
• lib32/pci.c (modified) (1 diff)

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

@@ -223 +223 @@
 
 #define NUMA_NO_NODE    (-1)
-#if 0
-extern void *devres_alloc_node(dr_release_t release, size_t size, gfp_t gfp,
-                               int nid);
-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

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

@@ -82 +82 @@
 }
 
-#define devres_log(dev, node, op)       do {} while (0)
-
 static void add_dr(struct device *dev, struct devres_node *node)
 {
         devres_log(dev, node, "ADD");
         BUG_ON(!list_empty(&node->entry));
-//#ifndef TARGET_OS2
-        /* Traps here on OS/2 - release builds on non-HDA hardware only */
-        rprintf(("add_dr"));
         list_add_tail(&node->entry, &dev->devres_head);
-        rprintf(("add_dr2"));
-//#endif
 }
 

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

@@ -205 +205 @@
         pcidev->dev.dma_mask = &pcidev->dma_mask;
         pcidev->dev.coherent_dma_mask = 0xffffffffull;
+        INIT_LIST_HEAD(&pcidev->dev.devres_head);
 
         // Subsystem ID