Changeset 717 for GPL/trunk/include

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)
• include/linux/device.h (modified) (1 diff)
• include/linux/interrupt.h (modified) (1 diff)
• include/linux/io.h (modified) (1 diff)
• include/linux/ioport.h (modified) (1 diff)
• include/linux/leds.h (modified) (1 diff)
• include/linux/pci.h (modified) (1 diff)
• include/linux/pm.h (modified) (1 diff)
• include/linux/string.h (modified) (1 diff)

GPL/trunk/include/linux/device.h

@@ -290 +290 @@
 /* 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)
+
+
+/* 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);
 #endif /* _LINUX_DEVICE_H */
 

GPL/trunk/include/linux/interrupt.h

@@ -154 +154 @@
 
 static inline void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id) {}
+#define devm_request_irq(A, B, C, D, E, F) request_irq(B, C, D, E, F)
+
 #endif

GPL/trunk/include/linux/io.h

@@ -7 +7 @@
 #include <linux/err.h>
 
+#define devm_ioremap(A, B, C) ioremap(B, C)
 #endif /* _LINUX_IO_H */

GPL/trunk/include/linux/ioport.h

@@ -111 +111 @@
 extern int autoirq_report(int waittime);
 
+#define devm_request_region(A, B, C, D) request_region(B, C, D)
 #endif  /* _LINUX_IOPORT_H */

GPL/trunk/include/linux/leds.h

@@ -20 +20 @@
 };
 
+enum led_audio {
+        LED_AUDIO_MUTE,         /* master mute LED */
+        LED_AUDIO_MICMUTE,      /* mic mute LED */
+        NUM_AUDIO_LEDS
+};
 #endif /* _LINUX_LEDS_H */

GPL/trunk/include/linux/pci.h

@@ -770 +770 @@
 
 #define dev_is_pci(d) (true)
-
+int pcim_enable_device(struct pci_dev *pdev);
+#define pcim_iomap pci_iomap
+int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name);
 #endif /* LINUX_PCI_H */

GPL/trunk/include/linux/pm.h

@@ -246 +246 @@
         struct device           * pm_parent;
         struct list_head        entry;
+        enum rpm_status         runtime_status;
 };
 

GPL/trunk/include/linux/string.h

@@ -30 +30 @@
 #define vmemdup_user memdup_user
 #define scnprintf snprintf
+ssize_t strscpy(char *dest, const char *src, size_t count);
+
 #endif