Commit fc9cb46b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pciids: use designated initializers in INTEL_VGA_DEVICE() 



With IGT no longer using INTEL_VGA_DEVICE(), we can make it kernel
specific and use designated initializers. Ditto for
INTEL_QUANTA_VGA_DEVICE(). Remove the superfluous comments while at it.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ce15f8f2a6b672155f9728c8e6a5f49d33fafd24.1725443418.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0fd1bf3e

include/drm/intel/i915_pciids.h

+14 −21
Original line number Diff line number Diff line
@@ -25,27 +25,20 @@ 
#ifndef _I915_PCIIDS_H

#define _I915_PCIIDS_H



/*

 * A pci_device_id struct {

 *	__u32 vendor, device;

 *      __u32 subvendor, subdevice;

 *	__u32 class, class_mask;

 *	kernel_ulong_t driver_data;

 * };

 * 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 }

#ifdef __KERNEL__

#define INTEL_VGA_DEVICE(_id, _info) { \

	PCI_DEVICE(PCI_VENDOR_ID_INTEL, (_id)), \

	.class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \

	.driver_data = (kernel_ulong_t)(_info), \

}



#define INTEL_QUANTA_VGA_DEVICE(_info) { \

	.vendor = PCI_VENDOR_ID_INTEL, .device = 0x16a, \

	.subvendor = 0x152d, .subdevice = 0x8990, \

	.class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \

	.driver_data = (kernel_ulong_t)(_info), \

}

#endif



#define INTEL_I810_IDS(MACRO__, ...) \

	MACRO__(0x7121, ## __VA_ARGS__), /* I810 */ \