Commit e4f4ffa8 authored May 18, 2020 by Nathan Chancellor Committed by Michael Ellerman May 28, 2020

input: i8042 - Remove special PowerPC handling



This causes a build error with CONFIG_WALNUT because kb_cs and kb_data
were removed in commit 917f0af9 ("powerpc: Remove arch/ppc and
include/asm-ppc").

ld.lld: error: undefined symbol: kb_cs
> referenced by i8042-ppcio.h:28 (drivers/input/serio/i8042-ppcio.h:28)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a
> referenced by i8042-ppcio.h:28 (drivers/input/serio/i8042-ppcio.h:28)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a
> referenced by i8042-ppcio.h:28 (drivers/input/serio/i8042-ppcio.h:28)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a

ld.lld: error: undefined symbol: kb_data
> referenced by i8042.c:309 (drivers/input/serio/i8042.c:309)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a
> referenced by i8042-ppcio.h:33 (drivers/input/serio/i8042-ppcio.h:33)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a
> referenced by i8042.c:319 (drivers/input/serio/i8042.c:319)
> input/serio/i8042.o:(__i8042_command) in archive drivers/built-in.a
> referenced 15 more times

Presumably since nobody has noticed this for the last 12 years, there is
not anyone actually trying to use this driver so we can just remove this
special walnut code and use the generic header so it builds for all
configurations.

Fixes: 917f0af9 ("powerpc: Remove arch/ppc and include/asm-ppc")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/20200518181043.3363953-1-natechancellor@gmail.com

parent 0c444d98

drivers/input/serio/i8042-ppcio.h

deleted100644 → 0

+0 −57

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		#ifndef _I8042_PPCIO_H
		#define _I8042_PPCIO_H


		#if defined(CONFIG_WALNUT)

		#define I8042_KBD_IRQ 25
		#define I8042_AUX_IRQ 26

		#define I8042_KBD_PHYS_DESC "walnutps2/serio0"
		#define I8042_AUX_PHYS_DESC "walnutps2/serio1"
		#define I8042_MUX_PHYS_DESC "walnutps2/serio%d"

		extern void *kb_cs;
		extern void *kb_data;

		#define I8042_COMMAND_REG ((int )kb_cs)
		#define I8042_DATA_REG ((int )kb_data)

		static inline int i8042_read_data(void)
		{
		return readb(kb_data);
		}

		static inline int i8042_read_status(void)
		{
		return readb(kb_cs);
		}

		static inline void i8042_write_data(int val)
		{
		writeb(val, kb_data);
		}

		static inline void i8042_write_command(int val)
		{
		writeb(val, kb_cs);
		}

		static inline int i8042_platform_init(void)
		{
		i8042_reset = I8042_RESET_ALWAYS;
		return 0;
		}

		static inline void i8042_platform_exit(void)
		{
		}

		#else

		#include "i8042-io.h"

		#endif

		#endif /* _I8042_PPCIO_H */

drivers/input/serio/i8042.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@
		#include "i8042-ip22io.h"
		#elif defined(CONFIG_SNI_RM)
		#include "i8042-snirm.h"
		#elif defined(CONFIG_PPC)
		#include "i8042-ppcio.h"
		#elif defined(CONFIG_SPARC)
		#include "i8042-sparcio.h"
		#elif defined(CONFIG_X86) \|\| defined(CONFIG_IA64)

Admin message