[1/3] drm/i915/pciids: add common INTEL_VGA_DEVICE_INIT macro

Commit Message

Jani Nikula March 11, 2022, 10:18 a.m. UTC

Add a shared abstraction for the initialization to help follow-up
changes.

Signed-off-by: Jani Nikula <[e-mail]>
---
 include/drm/i915_pciids.h | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Patch

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 3609f3254f24..637333c9e1c0 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -35,17 +35,18 @@ 
  * Don't use C99 here because "class" is reserved and we want to
  * give userspace flexibility.
  */
-#define INTEL_VGA_DEVICE(id, info) {		\
-	0x8086,	id,				\
-	~0, ~0,					\
-	0x030000, 0xff0000,			\
-	(unsigned long) info }
-
-#define INTEL_QUANTA_VGA_DEVICE(info) {		\
-	0x8086,	0x16a,				\
-	0x152d,	0x8990,				\
-	0x030000, 0xff0000,			\
-	(unsigned long) info }
+#define INTEL_VGA_DEVICE_INIT(__id, __subvendor, __subdevice, __info) { \
+		0x8086, (__id),						\
+		(__subvendor), (__subdevice),				\
+		0x030000, 0xff0000,					\
+		(kernel_ulong_t)(__info),				\
+	}
+
+#define INTEL_VGA_DEVICE(__id, __info)			\
+	INTEL_VGA_DEVICE_INIT(__id, ~0, ~0, __info)
+
+#define INTEL_QUANTA_VGA_DEVICE(__info)				\
+	INTEL_VGA_DEVICE_INIT(0x16a, 0x152d, 0x8990, __info)
 
 #define INTEL_I810_IDS(info)					\
 	INTEL_VGA_DEVICE(0x7121, info), /* I810 */		\