Changeset 717 for GPL/trunk/lib32

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/devres.c (modified) (3 diffs)
• lib32/driver.c (modified) (2 diffs)
• lib32/pci.c (modified) (1 diff)

GPL/trunk/lib32/devres.c

@@ -36 +36 @@
 };
 
+#define devres_log(dev, node, op)       do {} while (0)
+
 /*
  * Release functions for devres group.  These callbacks are used only
@@ -75 +77 @@
 
 #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 */
+        list_add_tail(&node->entry, &dev->devres_head);
+//#endif
+}
+
+/**
+ * devres_add - Register device resource
+ * @dev: Device to add resource to
+ * @res: Resource to register
+ *
+ * Register devres @res to @dev.  @res should have been allocated
+ * using devres_alloc().  On driver detach, the associated release
+ * function will be invoked and devres will be freed automatically.
+ */
+void devres_add(struct device *dev, void *res)
+{
+        /* Traps here on OS/2 */
+        struct devres *dr = container_of(res, struct devres, data);
+        unsigned long flags;
+        spin_lock_irqsave(&dev->devres_lock, flags);
+        add_dr(dev, &dr->node);
+        spin_unlock_irqrestore(&dev->devres_lock, flags);
+}
 
 /**
@@ -273 +304 @@
         return NULL;
 }
+
+/**
+ * devm_add_action() - add a custom action to list of managed resources
+ * @dev: Device that owns the action
+ * @action: Function that should be called
+ * @data: Pointer to data passed to @action implementation
+ *
+ * This adds a custom action to the list of managed resources so that
+ * it gets executed as part of standard resource unwinding.
+ */
+int devm_add_action(struct device *dev, void (*action)(void *), void *data)
+{
+        return 0;
+}
+
+/**
+ * devm_remove_action() - removes previously added custom action
+ * @dev: Device that owns the action
+ * @action: Function implementing the action
+ * @data: Pointer to data passed to @action implementation
+ *
+ * Removes instance of @action previously added by devm_add_action().
+ * Both action and data should match one of the existing entries.
+ */
+void devm_remove_action(struct device *dev, void (*action)(void *), void *data)
+{
+}

GPL/trunk/lib32/driver.c

@@ -26 +26 @@
 #include "base.h"
 
-#define devres_log(dev, node, op)       do {} while (0)
-
-struct devres_node {
-        struct list_head                entry;
-        dr_release_t                    release;
-#ifdef CONFIG_DEBUG_DEVRES
-        const char                      *name;
-        size_t                          size;
-#endif
-};
-
-struct devres {
-        struct devres_node              node;
-        /* -- 3 pointers */
-        unsigned long long              data[1];        /* guarantee ull alignment */
-};
-
-
 /**
  * dev_set_name - set a device name
@@ -60 +42 @@
 }
 
-static void add_dr(struct device *dev, struct devres_node *node)
-{
-        devres_log(dev, node, "ADD");
-        BUG_ON(!list_empty(&node->entry));
-        list_add_tail(&node->entry, &dev->devres_head);
-}
-
-/**
- * devres_add - Register device resource
- * @dev: Device to add resource to
- * @res: Resource to register
- *
- * Register devres @res to @dev.  @res should have been allocated
- * using devres_alloc().  On driver detach, the associated release
- * function will be invoked and devres will be freed automatically.
- */
-void devres_add(struct device *dev, void *res)
-{
-        struct devres *dr = container_of(res, struct devres, data);
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev->devres_lock, flags);
-        add_dr(dev, &dr->node);
-        spin_unlock_irqrestore(&dev->devres_lock, flags);
-}
+
 
 static struct device *next_device(struct klist_iter *i)

GPL/trunk/lib32/pci.c

@@ -455 +455 @@
 
 /**
+ * pcim_enable_device - Managed pci_enable_device()
+ * @pdev: PCI device to be initialized
+ *
+ * Managed pci_enable_device().
+ */
+int pcim_enable_device(struct pci_dev *pdev)
+{
+        int rc;
+
+        rc = pci_enable_device(pdev);
+        return rc;
+}
+
+/**
  *  Initialize device before it's used by a driver. Ask low-level code
  *  to enable I/O and memory. Wake up the device if it was suspended.