]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
resource: split DEFINE_RES_NAMED_DESC() out of DEFINE_RES_NAMED()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 17 Mar 2025 18:11:10 +0000 (20:11 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 22 Mar 2025 05:10:04 +0000 (22:10 -0700)
Patch series "resource: Split and use DEFINE_RES*() macros", v2.

Replace open coded variants of DEFINE_RES*() macros.

Note, there are many more possibilities over the kernel and even in
reources.c, however the latter contains not so trivial leftovers.  That's
why the examples cover only straightforward conversions.

This patch (of 4):

In some cases it would be useful to supply predefined descriptor of the
resource.  For this, introduce DEFINE_RES_NAMED_DESC() macro.

While at it, provide DEFINE_RES() that takes only start, size,
and flags.

Link: https://lkml.kernel.org/r/20250317181412.1560630-1-andriy.shevchenko@linux.intel.com
Link: https://lkml.kernel.org/r/20250317181412.1560630-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/linux/ioport.h

index 5385349f0b8a68cb390bc7c1270b11223d5667f8..e8b2d6aa401356892fa3d29c7d24d23de4320023 100644 (file)
@@ -154,15 +154,20 @@ enum {
 };
 
 /* helpers to define resources */
-#define DEFINE_RES_NAMED(_start, _size, _name, _flags)                 \
+#define DEFINE_RES_NAMED_DESC(_start, _size, _name, _flags, _desc)     \
 (struct resource) {                                                    \
                .start = (_start),                                      \
                .end = (_start) + (_size) - 1,                          \
                .name = (_name),                                        \
                .flags = (_flags),                                      \
-               .desc = IORES_DESC_NONE,                                \
+               .desc = (_desc),                                        \
        }
 
+#define DEFINE_RES_NAMED(_start, _size, _name, _flags)                 \
+       DEFINE_RES_NAMED_DESC(_start, _size, _name, _flags, IORES_DESC_NONE)
+#define DEFINE_RES(_start, _size, _flags)                              \
+       DEFINE_RES_NAMED(_start, _size, NULL, _flags)
+
 #define DEFINE_RES_IO_NAMED(_start, _size, _name)                      \
        DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_IO)
 #define DEFINE_RES_IO(_start, _size)                                   \