[PATCH] drm/nouveau/i2c: rename aux.c and aux.h to nvkm_i2c_aux.c and nvkm_i2c_aux.h

Sun Jun 2 23:32:25 UTC 2024

On 3/6/24 09:27, Szőke Benjamin wrote:

> 2024. 06. 03. 0:08 keltezéssel, Ben Skeggs írta:
>> On 2/6/24 07:22, egyszeregy at freemail.hu wrote:
>>
>>> From: Benjamin Szőke <egyszeregy at freemail.hu>
>>>
>>> The goal is to clean-up Linux repository from AUX file names, because
>>> the use of such file names is prohibited on other operating systems
>>> such as Windows, so the Linux repository cannot be cloned and
>>> edited on them.
>>>
>>> Signed-off-by: Benjamin Szőke <egyszeregy at freemail.hu>
>>> ---
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 2 +-
>>>   .../gpu/drm/nouveau/nvkm/subdev/i2c/{aux.c => nvkm_i2c_aux.c}   | 
>>> 2 +-
>>>   .../gpu/drm/nouveau/nvkm/subdev/i2c/{aux.h => nvkm_i2c_aux.h}   | 0
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c | 2 +-
>>> drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c | 2 +-
>>>   11 files changed, 10 insertions(+), 10 deletions(-)
>>>   rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{aux.c => 
>>> nvkm_i2c_aux.c} (99%)
>>>   rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{aux.h => 
>>> nvkm_i2c_aux.h} (100%)
>>
>> NACK on this rename.  No other part of NVKM uses filenames like this. 
>> If anything, auxch.[ch] would be a better choice.
>>
>> Ben.
>
> Do you mean it would be better to rename them in the following way?
>
> rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{aux.c => auxc.c}
> rename drivers/gpu/drm/nouveau/nvkm/subdev/i2c/{aux.h => auxh.h}

Not quite.  "aux" refers to DP "AUX CHannels", so, auxch.c and auxch.h 
are OK names.

>
>
>>
>>>
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild
>>> index 819703913a00..c488dfce4392 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild
>>> @@ -25,7 +25,7 @@ nvkm-y += nvkm/subdev/i2c/busnv50.o
>>>   nvkm-y += nvkm/subdev/i2c/busgf119.o
>>>   nvkm-y += nvkm/subdev/i2c/bit.o
>>> -nvkm-y += nvkm/subdev/i2c/aux.o
>>> +nvkm-y += nvkm/subdev/i2c/nvkm_i2c_aux.o
>>>   nvkm-y += nvkm/subdev/i2c/auxg94.o
>>>   nvkm-y += nvkm/subdev/i2c/auxgf119.o
>>>   nvkm-y += nvkm/subdev/i2c/auxgm200.o
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
>>> index dd391809fef7..30bf84e77db9 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
>>> @@ -24,7 +24,7 @@
>>>   #define anx9805_pad(p) container_of((p), struct anx9805_pad, base)
>>>   #define anx9805_bus(p) container_of((p), struct anx9805_bus, base)
>>>   #define anx9805_aux(p) container_of((p), struct anx9805_aux, base)
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "bus.h"
>>>   struct anx9805_pad {
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
>>> index 47068f6f9c55..9e07ba444ca8 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs <bskeggs at redhat.com>
>>>    */
>>>   #define g94_i2c_aux(p) container_of((p), struct g94_i2c_aux, base)
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   struct g94_i2c_aux {
>>>       struct nvkm_i2c_aux base;
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c
>>> index dab40cd8fe3a..8709b728c38b 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c
>>> @@ -19,7 +19,7 @@
>>>    * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
>>> USE OR
>>>    * OTHER DEALINGS IN THE SOFTWARE.
>>>    */
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   static const struct nvkm_i2c_aux_func
>>>   gf119_i2c_aux = {
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
>>> index 8bd1d442e465..f40c5709d217 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs <bskeggs at redhat.com>
>>>    */
>>>   #define gm200_i2c_aux(p) container_of((p), struct gm200_i2c_aux, 
>>> base)
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   struct gm200_i2c_aux {
>>>       struct nvkm_i2c_aux base;
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
>>> index 976539de4220..736275f0c774 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs
>>>    */
>>>   #include "priv.h"
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "bus.h"
>>>   #include "pad.h"
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nvkm_i2c_aux.c
>>> similarity index 99%
>>> rename from drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
>>> rename to drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nvkm_i2c_aux.c
>>> index d063d0dc13c5..6b76df02c63a 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nvkm_i2c_aux.c
>>> @@ -24,7 +24,7 @@
>>>   #include <linux/string_helpers.h>
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "pad.h"
>>>   static int
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nvkm_i2c_aux.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
>>> rename to drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nvkm_i2c_aux.h
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c
>>> index 5904bc5f2d2a..e9c55a57c878 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs
>>>    */
>>>   #include "pad.h"
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "bus.h"
>>>   void
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c
>>> index 3bc4d0310076..1af64e25d838 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs
>>>    */
>>>   #include "pad.h"
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "bus.h"
>>>   static const struct nvkm_i2c_pad_func
>>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c 
>>> b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c
>>> index 7d417f6a816e..997a5a2146c4 100644
>>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c
>>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c
>>> @@ -22,7 +22,7 @@
>>>    * Authors: Ben Skeggs
>>>    */
>>>   #include "pad.h"
>>> -#include "aux.h"
>>> +#include "nvkm_i2c_aux.h"
>>>   #include "bus.h"
>>>   static void
>