Input: mad16 (OSS) - do not carry around gameport code if gameport core
support is disabled.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
diff --git a/sound/oss/mad16.c b/sound/oss/mad16.c
index a7067f1..aa3c50d 100644
--- a/sound/oss/mad16.c
+++ b/sound/oss/mad16.c
@@ -50,9 +50,12 @@
#include "sb.h"
#include "mpu401.h"
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+#define SUPPORT_JOYSTICK 1
+#endif
+
static int mad16_conf;
static int mad16_cdsel;
-static struct gameport *gameport;
static DEFINE_SPINLOCK(lock);
#define C928 1
@@ -902,6 +905,10 @@
-1, -1, -1, -1
};
+#ifdef SUPPORT_JOYSTICK
+
+static struct gameport *gameport;
+
static int __devinit mad16_register_gameport(int io_port)
{
if (!request_region(io_port, 1, "mad16 gameport")) {
@@ -925,6 +932,20 @@
return 0;
}
+static inline void mad16_unregister_gameport(void)
+{
+ if (gameport) {
+ /* the gameport was initialized so we must free it up */
+ gameport_unregister_port(gameport);
+ gameport = NULL;
+ release_region(0x201, 1);
+ }
+}
+#else
+static inline int mad16_register_gameport(int io_port) { return -ENOSYS; }
+static inline void mad16_unregister_gameport(void) { }
+#endif
+
static int __devinit init_mad16(void)
{
int dmatype = 0;
@@ -1060,12 +1081,7 @@
{
if (found_mpu)
unload_mad16_mpu(&cfg_mpu);
- if (gameport) {
- /* the gameport was initialized so we must free it up */
- gameport_unregister_port(gameport);
- gameport = NULL;
- release_region(0x201, 1);
- }
+ mad16_unregister_gameport();
unload_mad16(&cfg);
release_region(MC0_PORT, 12);
}