kernel-doc: parse DECLARE_KFIFO and DECLARE_KFIFO_PTR()

DECLARE_KFIFO and DECLARE_KFIFO_PTR needs similar handling to DECLARE_BITMAP
because otherwise kernel-doc assumes the member name is the last, not first
macro parameter.

The origin comes from Jakub Mauro [1] patching the Perl kernel-doc parser in
'./scripts' Linux tree.

[1] https://www.mail-archive.com/linux-doc@vger.kernel.org/msg17005.html

Suggested-by: Randy Dunlap <rdunlap@infradead.org>
Suggested-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

Author: return42

docs/linuxdoc-howto/all-in-a-tumble.h

@@ -428,3 +428,27 @@ struct something {
 	barbar;
 };
 
+/**
+ * struct lineevent_state - contains the state of a userspace event
+ * @gdev: the GPIO device the event pertains to
+ * @label: consumer label used to tag descriptors
+ * @desc: the GPIO descriptor held by this event
+ * @eflags: the event flags this line was requested with
+ * @irq: the interrupt that trigger in response to events on this GPIO
+ * @wait: wait queue that handles blocking reads of events
+ * @events: KFIFO for the GPIO events (testing DECLARE_KFIFO)
+ * @foobar: testing DECLARE_KFIFO_PTR
+ * @read_lock: mutex lock to protect reads from colliding with adding
+ * new events to the FIFO
+ */
+struct lineevent_state {
+	struct gpio_device *gdev;
+	const char *label;
+	struct gpio_desc *desc;
+	u32 eflags;
+	int irq;
+	wait_queue_head_t wait;
+	DECLARE_KFIFO(events, struct gpioevent_data, 16);
+	DECLARE_KFIFO_PTR(foobar, struct lirc_scancode);
+	struct mutex read_lock;
+};

linuxdoc/kernel_doc.py

@@ -2495,15 +2495,25 @@ def prepare_struct_union(self, proto):
             members = re.sub(r"\s*CRYPTO_MINALIGN_ATTR", "", members)
 
             # replace DECLARE_BITMAP
-            members = re.sub(r"DECLARE_BITMAP\s*\(([^,)]+), ([^,)]+)\)"
+            members = re.sub(r"DECLARE_BITMAP\s*\(([^,)]+),\s*([^,)]+)\)"
                              , r"unsigned long \1[BITS_TO_LONGS(\2)]"
                              , members )
 
             # replace DECLARE_HASHTABLE
-            members = re.sub(r"DECLARE_HASHTABLE\s*\(([^,)]+), ([^,)]+)\)"
+            members = re.sub(r"DECLARE_HASHTABLE\s*\(([^,)]+),\s*([^,)]+)\)"
                              , r"unsigned long \1[1 << ((\2) - 1)]"
                              , members )
 
+            # replace DECLARE_KFIFO
+            members = re.sub(r"DECLARE_KFIFO\s*\(([^,)]+),\s*([^,)]+),\s*([^,)]+)\)"
+                             , r"\2 \1"
+                             , members )
+
+            # replace DECLARE_KFIFO_PTR
+            members = re.sub(r"DECLARE_KFIFO_PTR\s*\(([^,)]+),\s*([^,)]+)\)"
+                             , r"\2 \1"
+                             , members )
+
             # Split nested struct/union elements as newer ones
             NESTED = RE(r"(struct|union)([^{};]+){([^{}]*)}([^{}\;]*)\;")
             while NESTED.search(members):