drm/i915/pci: rename functions to have i915_pci prefix

Follow the usual naming conventions. While at it, fix i915_pci.h SPDX
license comment format and add header include guards.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210825150623.28980-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_module.c b/drivers/gpu/drm/i915/i915_module.c
index d8b4482c69d0e810a8435728ff1d820935229ad4..ab2295dd450018562635d5a8fb2aab79b9611e71 100644 (file)
--- a/drivers/gpu/drm/i915/i915_module.c
+++ b/drivers/gpu/drm/i915/i915_module.c
@@ -67,8 +67,8 @@ static const struct {
        { .init = i915_mock_selftests },
        { .init = i915_pmu_init,
          .exit = i915_pmu_exit },
-       { .init = i915_register_pci_driver,
-         .exit = i915_unregister_pci_driver },
+       { .init = i915_pci_register_driver,
+         .exit = i915_pci_unregister_driver },
        { .init = i915_perf_sysctl_register,
          .exit = i915_perf_sysctl_unregister },
 };

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 3fb55e2404b6a45f7a20fb16b3ef4bc8c96249ab..f0e2f5e67bdade1209c55c547b00defa65db0fe8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1216,12 +1216,12 @@ static struct pci_driver i915_pci_driver = {
        .driver.pm = &i915_pm_ops,
 };
 
-int i915_register_pci_driver(void)
+int i915_pci_register_driver(void)
 {
        return pci_register_driver(&i915_pci_driver);
 }
 
-void i915_unregister_pci_driver(void)
+void i915_pci_unregister_driver(void)
 {
        pci_unregister_driver(&i915_pci_driver);
 }

diff --git a/drivers/gpu/drm/i915/i915_pci.h b/drivers/gpu/drm/i915/i915_pci.h
index b386f319f52e1c20e12d25b95cdc222bcb60f322..ee048c2381740d390ccb0a35bd20b89002e67bff 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.h
+++ b/drivers/gpu/drm/i915/i915_pci.h
@@ -1,8 +1,12 @@
+/* SPDX-License-Identifier: MIT */
 /*
- * SPDX-License-Identifier: MIT
- *
  * Copyright © 2021 Intel Corporation
  */
 
-int i915_register_pci_driver(void);
-void i915_unregister_pci_driver(void);
+#ifndef __I915_PCI_H__
+#define __I915_PCI_H__
+
+int i915_pci_register_driver(void);
+void i915_pci_unregister_driver(void);
+
+#endif /* __I915_PCI_H__ */