drm/i915/driver: add i915_driver_ prefix to functions

Add the i915_driver_ prefix to the switcheroo functions in
i915_driver.[ch].

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211111101304.13094-3-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 1ef1a4f2815d9012f399271fa24d98292d5e9e1b..b394b8702f1cc9b808e0bf2cf649aeb12e57e788 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1220,7 +1220,8 @@ out:
        return ret;
 }
 
-int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state)
+int i915_driver_suspend_switcheroo(struct drm_i915_private *i915,
+                                  pm_message_t state)
 {
        int error;
 
@@ -1381,7 +1382,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
        return ret;
 }
 
-int i915_resume_switcheroo(struct drm_i915_private *i915)
+int i915_driver_resume_switcheroo(struct drm_i915_private *i915)
 {
        int ret;
 

diff --git a/drivers/gpu/drm/i915/i915_driver.h b/drivers/gpu/drm/i915/i915_driver.h
index e99c00fb6312ba615767517ce35fbce73b97276c..9ef8db4aa0a6f596e7348d2517e129420f689add 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.h
+++ b/drivers/gpu/drm/i915/i915_driver.h
@@ -18,7 +18,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 void i915_driver_remove(struct drm_i915_private *i915);
 void i915_driver_shutdown(struct drm_i915_private *i915);
 
-int i915_resume_switcheroo(struct drm_i915_private *i915);
-int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
+int i915_driver_resume_switcheroo(struct drm_i915_private *i915);
+int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
 
 #endif /* __I915_DRIVER_H__ */

diff --git a/drivers/gpu/drm/i915/i915_switcheroo.c b/drivers/gpu/drm/i915/i915_switcheroo.c
index 7f06f5ad074986747766b17ee8af5173d44e5131..23777d500cdf95972dcc1b3f55a91eac7f5c5982 100644 (file)
--- a/drivers/gpu/drm/i915/i915_switcheroo.c
+++ b/drivers/gpu/drm/i915/i915_switcheroo.c
@@ -25,12 +25,12 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev,
                i915->drm.switch_power_state = DRM_SWITCH_POWER_CHANGING;
                /* i915 resume handler doesn't set to D0 */
                pci_set_power_state(pdev, PCI_D0);
-               i915_resume_switcheroo(i915);
+               i915_driver_resume_switcheroo(i915);
                i915->drm.switch_power_state = DRM_SWITCH_POWER_ON;
        } else {
                drm_info(&i915->drm, "switched off\n");
                i915->drm.switch_power_state = DRM_SWITCH_POWER_CHANGING;
-               i915_suspend_switcheroo(i915, pmm);
+               i915_driver_suspend_switcheroo(i915, pmm);
                i915->drm.switch_power_state = DRM_SWITCH_POWER_OFF;
        }
 }