| Message ID | b963446627e513ff7240e53fa1acde693514ec70.1725297097.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915 & drm/xe: shared PCI ID macros | expand |
On Mon, Sep 02, 2024 at 08:14:06PM +0300, Jani Nikula wrote: > In preparation of sharing the PCI ID macros between i915 and xe, rename > i915_pciids.h to pciids.h. > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > --- > > Could be intel_pciids.h too, but it's already in include/drm/intel > subdirectory. > --- > arch/x86/kernel/early-quirks.c | 2 +- > drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- > drivers/gpu/drm/i915/i915_pci.c | 2 +- > drivers/gpu/drm/i915/intel_device_info.c | 2 +- > include/drm/intel/{i915_pciids.h => pciids.h} | 6 +++--- > 5 files changed, 7 insertions(+), 7 deletions(-) > rename include/drm/intel/{i915_pciids.h => pciids.h} (99%) > > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c > index 29d1f9104e94..6b6f32f40cbe 100644 > --- a/arch/x86/kernel/early-quirks.c > +++ b/arch/x86/kernel/early-quirks.c > @@ -18,7 +18,7 @@ > #include <linux/bcma/bcma_regs.h> > #include <linux/platform_data/x86/apple.h> > #include <drm/intel/i915_drm.h> > -#include <drm/intel/i915_pciids.h> > +#include <drm/intel/pciids.h> > #include <asm/pci-direct.h> > #include <asm/dma.h> > #include <asm/io_apic.h> > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c > index 408c76852495..ef783648e4c3 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -3,7 +3,7 @@ > * Copyright © 2023 Intel Corporation > */ > > -#include <drm/intel/i915_pciids.h> > +#include <drm/intel/pciids.h> > #include <drm/drm_color_mgmt.h> > #include <linux/pci.h> > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 617f411feb8c..4cfe339a805b 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -24,7 +24,7 @@ > > #include <drm/drm_color_mgmt.h> > #include <drm/drm_drv.h> > -#include <drm/intel/i915_pciids.h> > +#include <drm/intel/pciids.h> > > #include "display/intel_display_driver.h" > #include "gt/intel_gt_regs.h" > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index 3c47c625993e..ff9500194d15 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -25,7 +25,7 @@ > #include <linux/string_helpers.h> > > #include <drm/drm_print.h> > -#include <drm/intel/i915_pciids.h> > +#include <drm/intel/pciids.h> > > #include "gt/intel_gt_regs.h" > #include "i915_drv.h" > diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/pciids.h > similarity index 99% > rename from include/drm/intel/i915_pciids.h > rename to include/drm/intel/pciids.h > index 25ef0a17efbe..3c4ce82002a9 100644 > --- a/include/drm/intel/i915_pciids.h > +++ b/include/drm/intel/pciids.h > @@ -22,8 +22,8 @@ > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > */ > -#ifndef _I915_PCIIDS_H > -#define _I915_PCIIDS_H > +#ifndef __PCIIDS_H__ > +#define __PCIIDS_H__ > > #ifdef __KERNEL__ > #define INTEL_VGA_DEVICE(_id, _info) { \ > @@ -809,4 +809,4 @@ > MACRO__(0xE20D, ## __VA_ARGS__), \ > MACRO__(0xE212, ## __VA_ARGS__) > > -#endif /* _I915_PCIIDS_H */ > +#endif /* __PCIIDS_H__ */ > -- > 2.39.2 >
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 29d1f9104e94..6b6f32f40cbe 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -18,7 +18,7 @@ #include <linux/bcma/bcma_regs.h> #include <linux/platform_data/x86/apple.h> #include <drm/intel/i915_drm.h> -#include <drm/intel/i915_pciids.h> +#include <drm/intel/pciids.h> #include <asm/pci-direct.h> #include <asm/dma.h> #include <asm/io_apic.h> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index 408c76852495..ef783648e4c3 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -3,7 +3,7 @@ * Copyright © 2023 Intel Corporation */ -#include <drm/intel/i915_pciids.h> +#include <drm/intel/pciids.h> #include <drm/drm_color_mgmt.h> #include <linux/pci.h> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 617f411feb8c..4cfe339a805b 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -24,7 +24,7 @@ #include <drm/drm_color_mgmt.h> #include <drm/drm_drv.h> -#include <drm/intel/i915_pciids.h> +#include <drm/intel/pciids.h> #include "display/intel_display_driver.h" #include "gt/intel_gt_regs.h" diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 3c47c625993e..ff9500194d15 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -25,7 +25,7 @@ #include <linux/string_helpers.h> #include <drm/drm_print.h> -#include <drm/intel/i915_pciids.h> +#include <drm/intel/pciids.h> #include "gt/intel_gt_regs.h" #include "i915_drv.h" diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/pciids.h similarity index 99% rename from include/drm/intel/i915_pciids.h rename to include/drm/intel/pciids.h index 25ef0a17efbe..3c4ce82002a9 100644 --- a/include/drm/intel/i915_pciids.h +++ b/include/drm/intel/pciids.h @@ -22,8 +22,8 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#ifndef _I915_PCIIDS_H -#define _I915_PCIIDS_H +#ifndef __PCIIDS_H__ +#define __PCIIDS_H__ #ifdef __KERNEL__ #define INTEL_VGA_DEVICE(_id, _info) { \ @@ -809,4 +809,4 @@ MACRO__(0xE20D, ## __VA_ARGS__), \ MACRO__(0xE212, ## __VA_ARGS__) -#endif /* _I915_PCIIDS_H */ +#endif /* __PCIIDS_H__ */
In preparation of sharing the PCI ID macros between i915 and xe, rename i915_pciids.h to pciids.h. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- Could be intel_pciids.h too, but it's already in include/drm/intel subdirectory. --- arch/x86/kernel/early-quirks.c | 2 +- drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- include/drm/intel/{i915_pciids.h => pciids.h} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename include/drm/intel/{i915_pciids.h => pciids.h} (99%)