2022-09-17 06:58:00

by Huacai Chen

Subject: [PATCH 1/2] Input: i8042: Rename i8042-x86ia64io.h to i8042-acpipnpio.h

Now i8042-x86ia64io.h is shared by X86 and IA64, but it can be shared
by more platforms (such as LoongArch) with ACPI firmware on which PNP
typed keyboard and mouse is configured in DSDT. So rename it to i8042-
acpipnpio.h.

Signed-off-by: Huacai Chen <[email protected]>
---
.../input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 6 +++---
drivers/input/serio/i8042.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename drivers/input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} (99%)

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-acpipnpio.h
similarity index 99%
rename from drivers/input/serio/i8042-x86ia64io.h
rename to drivers/input/serio/i8042-acpipnpio.h
index 4fbec7bbecca..d14b9fb59d6c 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-acpipnpio.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _I8042_X86IA64IO_H
-#define _I8042_X86IA64IO_H
+#ifndef _I8042_ACPIPNPIO_H
+#define _I8042_ACPIPNPIO_H


#ifdef CONFIG_X86
@@ -1665,4 +1665,4 @@ static inline void i8042_platform_exit(void)
i8042_pnp_exit();
}

-#endif /* _I8042_X86IA64IO_H */
+#endif /* _I8042_ACPIPNPIO_H */
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 55381783dc82..bf2592fa9a78 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -20,7 +20,7 @@
#elif defined(CONFIG_SPARC)
#include "i8042-sparcio.h"
#elif defined(CONFIG_X86) || defined(CONFIG_IA64)
-#include "i8042-x86ia64io.h"
+#include "i8042-acpipnpio.h"
#else
#include "i8042-io.h"
#endif
--
2.31.1

2022-09-22 08:18:40

by Mattijs Korpershoek

Subject: Re: [PATCH 1/2] Input: i8042: Rename i8042-x86ia64io.h to i8042-acpipnpio.h

On Sat, Sep 17, 2022 at 14:40, Huacai Chen <[email protected]> wrote:

> Now i8042-x86ia64io.h is shared by X86 and IA64, but it can be shared
> by more platforms (such as LoongArch) with ACPI firmware on which PNP
> typed keyboard and mouse is configured in DSDT. So rename it to i8042-
> acpipnpio.h.
>
> Signed-off-by: Huacai Chen <[email protected]>

Reviewed-by: Mattijs Korpershoek <[email protected]>

> ---
> .../input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 6 +++---
> drivers/input/serio/i8042.h | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
> rename drivers/input/serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} (99%)
>
> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-acpipnpio.h
> similarity index 99%
> rename from drivers/input/serio/i8042-x86ia64io.h
> rename to drivers/input/serio/i8042-acpipnpio.h
> index 4fbec7bbecca..d14b9fb59d6c 100644
> --- a/drivers/input/serio/i8042-x86ia64io.h
> +++ b/drivers/input/serio/i8042-acpipnpio.h
> @@ -1,6 +1,6 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> -#ifndef _I8042_X86IA64IO_H
> -#define _I8042_X86IA64IO_H
> +#ifndef _I8042_ACPIPNPIO_H
> +#define _I8042_ACPIPNPIO_H
>
>
> #ifdef CONFIG_X86
> @@ -1665,4 +1665,4 @@ static inline void i8042_platform_exit(void)
> i8042_pnp_exit();
> }
>
> -#endif /* _I8042_X86IA64IO_H */
> +#endif /* _I8042_ACPIPNPIO_H */
> diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
> index 55381783dc82..bf2592fa9a78 100644
> --- a/drivers/input/serio/i8042.h
> +++ b/drivers/input/serio/i8042.h
> @@ -20,7 +20,7 @@
> #elif defined(CONFIG_SPARC)
> #include "i8042-sparcio.h"
> #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
> -#include "i8042-x86ia64io.h"
> +#include "i8042-acpipnpio.h"
> #else
> #include "i8042-io.h"
> #endif
> --
> 2.31.1

2022-10-01 22:14:10

by Dmitry Torokhov

Subject: Re: [PATCH 1/2] Input: i8042: Rename i8042-x86ia64io.h to i8042-acpipnpio.h

On Sat, Sep 17, 2022 at 02:40:19PM +0800, Huacai Chen wrote:
> Now i8042-x86ia64io.h is shared by X86 and IA64, but it can be shared
> by more platforms (such as LoongArch) with ACPI firmware on which PNP
> typed keyboard and mouse is configured in DSDT. So rename it to i8042-
> acpipnpio.h.
>
> Signed-off-by: Huacai Chen <[email protected]>

Applied, thank you.

--
Dmitry