Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: gameport - add ISA and HAS_IOPORT dependencies

Browse Source 
In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. As ISA already implies HAS_IOPORT we can simply add
this dependency and guard sections of code using inb()/outb() as
alternative access methods.

Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230703152355.3897456-2-schnelle@linux.ibm.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Niklas Schnelle 2023-07-05 14:56:28 -07:00 committed by Dmitry Torokhov
parent 8c9cce9cb8
commit 650cda2ce2
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/gameport/Kconfig
View File

@ -25,6 +25,7 @@ if GAMEPORT
config GAMEPORT_NS558 config GAMEPORT_NS558
tristate "Classic ISA and PnP gameport support" tristate "Classic ISA and PnP gameport support"
depends on ISA
help help
Say Y here if you have an ISA or PnP gameport. Say Y here if you have an ISA or PnP gameport.
@ -35,6 +36,7 @@ config GAMEPORT_NS558
config GAMEPORT_L4 config GAMEPORT_L4
tristate "PDPI Lightning 4 gamecard support" tristate "PDPI Lightning 4 gamecard support"
depends on ISA
help help
Say Y here if you have a PDPI Lightning 4 gamecard. Say Y here if you have a PDPI Lightning 4 gamecard.
@ -53,7 +55,7 @@ config GAMEPORT_EMU10K1
config GAMEPORT_FM801 config GAMEPORT_FM801
tristate "ForteMedia FM801 gameport support" tristate "ForteMedia FM801 gameport support"
depends on PCI depends on PCI && HAS_IOPORT
help help
Say Y here if you have ForteMedia FM801 PCI audio controller Say Y here if you have ForteMedia FM801 PCI audio controller
(Abit AU10, Genius Sound Maker, HP Workstation zx2000, (Abit AU10, Genius Sound Maker, HP Workstation zx2000,

26
drivers/input/gameport/gameport.c
View File

@ -519,12 +519,32 @@ EXPORT_SYMBOL(gameport_set_phys);
static void gameport_default_trigger(struct gameport *gameport) static void gameport_default_trigger(struct gameport *gameport)
{ {
#ifdef CONFIG_HAS_IOPORT
outb(0xff, gameport->io); outb(0xff, gameport->io);
#endif
} }
static unsigned char gameport_default_read(struct gameport *gameport) static unsigned char gameport_default_read(struct gameport *gameport)
{ {
#ifdef CONFIG_HAS_IOPORT
return inb(gameport->io); return inb(gameport->io);
#else
return 0xff;
#endif
}
static void gameport_setup_default_handlers(struct gameport *gameport)
{
if ((!gameport->trigger || !gameport->read) &&
!IS_ENABLED(CONFIG_HAS_IOPORT))
dev_err(&gameport->dev,
"I/O port access is required for %s (%s) but is not available\n",
gameport->phys, gameport->name);
if (!gameport->trigger)
gameport->trigger = gameport_default_trigger;
if (!gameport->read)
gameport->read = gameport_default_read;
} }
/* /*
@ -545,11 +565,7 @@ static void gameport_init_port(struct gameport *gameport)
if (gameport->parent) if (gameport->parent)
gameport->dev.parent = &gameport->parent->dev; gameport->dev.parent = &gameport->parent->dev;
if (!gameport->trigger) gameport_setup_default_handlers(gameport);
gameport->trigger = gameport_default_trigger;
if (!gameport->read)
gameport->read = gameport_default_read;
INIT_LIST_HEAD(&gameport->node); INIT_LIST_HEAD(&gameport->node);
spin_lock_init(&gameport->timer_lock); spin_lock_init(&gameport->timer_lock);
timer_setup(&gameport->poll_timer, gameport_run_poll_handler, 0); timer_setup(&gameport->poll_timer, gameport_run_poll_handler, 0);