On Wed, 25 Aug 2021, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> On Wed, Aug 25, 2021 at 06:06:23PM +0300, Jani Nikula wrote:
>> 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@xxxxxxxx>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Thanks, pushed to drm-intel-gt-next.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/i915_module.c | 4 ++--
>> drivers/gpu/drm/i915/i915_pci.c | 4 ++--
>> drivers/gpu/drm/i915/i915_pci.h | 12 ++++++++----
>> 3 files changed, 12 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_module.c b/drivers/gpu/drm/i915/i915_module.c
>> index d8b4482c69d0..ab2295dd4500 100644
>> --- 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 96cfd6427cec..146f7e39182a 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -1235,12 +1235,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 b386f319f52e..ee048c238174 100644
>> --- 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__ */
>> --
>> 2.20.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
