Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/intel/pciids: rename i915_pciids.h to just pciids.h

In preparation of sharing the PCI ID macros between i915 and xe, rename
i915_pciids.h to pciids.h.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/835143845faa5310e4bb58405a8a0848392bbf06.1729590029.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+7 -7
+1 -1
arch/x86/kernel/early-quirks.c
··· 18 18 #include <linux/bcma/bcma_regs.h> 19 19 #include <linux/platform_data/x86/apple.h> 20 20 #include <drm/intel/i915_drm.h> 21 - #include <drm/intel/i915_pciids.h> 21 + #include <drm/intel/pciids.h> 22 22 #include <asm/pci-direct.h> 23 23 #include <asm/dma.h> 24 24 #include <asm/io_apic.h>
+1 -1
drivers/gpu/drm/i915/display/intel_display_device.c
··· 3 3 * Copyright © 2023 Intel Corporation 4 4 */ 5 5 6 - #include <drm/intel/i915_pciids.h> 6 + #include <drm/intel/pciids.h> 7 7 #include <drm/drm_color_mgmt.h> 8 8 #include <linux/pci.h> 9 9
+1 -1
drivers/gpu/drm/i915/i915_pci.c
··· 24 24 25 25 #include <drm/drm_color_mgmt.h> 26 26 #include <drm/drm_drv.h> 27 - #include <drm/intel/i915_pciids.h> 27 + #include <drm/intel/pciids.h> 28 28 29 29 #include "display/intel_display_driver.h" 30 30 #include "gt/intel_gt_regs.h"
+1 -1
drivers/gpu/drm/i915/intel_device_info.c
··· 25 25 #include <linux/string_helpers.h> 26 26 27 27 #include <drm/drm_print.h> 28 - #include <drm/intel/i915_pciids.h> 28 + #include <drm/intel/pciids.h> 29 29 30 30 #include "gt/intel_gt_regs.h" 31 31 #include "i915_drv.h"
+3 -3
include/drm/intel/i915_pciids.h include/drm/intel/pciids.h
··· 22 22 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 23 23 * DEALINGS IN THE SOFTWARE. 24 24 */ 25 - #ifndef _I915_PCIIDS_H 26 - #define _I915_PCIIDS_H 25 + #ifndef __PCIIDS_H__ 26 + #define __PCIIDS_H__ 27 27 28 28 #ifdef __KERNEL__ 29 29 #define INTEL_VGA_DEVICE(_id, _info) { \ ··· 822 822 MACRO__(0xB0A1, ## __VA_ARGS__), \ 823 823 MACRO__(0xB0A2, ## __VA_ARGS__) 824 824 825 - #endif /* _I915_PCIIDS_H */ 825 + #endif /* __PCIIDS_H__ */