[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem

Commit 2d4ba4a3b9aef95d328d74a17ae84f8d658059e2 introduced a dependency
that was never meant to exist when the ac97_bus.c module was created.
Move ac97_bus.c up the directory hierarchy to make sure it is built when
selected even if sound is configured out so things work as originally
intended.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 3d5f19658032c9f2bbe28bf8639879cd365150de..6b46c9bf1d2045c7bf79a1c2c977bdf92a6db27e 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -146,7 +146,7 @@ config TOUCHSCREEN_TOUCHWIN
 
 config TOUCHSCREEN_UCB1400
        tristate "Philips UCB1400 touchscreen"
-       depends on SND_AC97_BUS
+       select AC97_BUS
        help
          This enables support for the Philips UCB1400 touchscreen interface.
          The UCB1400 is an AC97 audio codec.  The touchscreen interface

diff --git a/sound/Kconfig b/sound/Kconfig
index 95949b6806acbdf9580b23b10e5e9cac8722df3e..9d77300746c648cdc6f9700605bc6666257fa5ca 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -93,4 +93,12 @@ endmenu
 
 endif
 
+config AC97_BUS
+       tristate
+       help
+         This is used to avoid config and link hard dependencies between the
+         sound subsystem and other function drivers completely unrelated to
+         sound although they're sharing the AC97 bus. Concerned drivers
+         should "select" this.
+
 endmenu

diff --git a/sound/Makefile b/sound/Makefile
index 5f6bef57e825023dea13901a119d38bcd1a88c95..9aee54c4882d95549f9e2f046164ce43e86944d6 100644 (file)
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -8,6 +8,9 @@ obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
 obj-$(CONFIG_SND_AOA) += aoa/
 
+# This one must be compilable even if sound is configured out
+obj-$(CONFIG_AC97_BUS) += ac97_bus.o
+
 ifeq ($(CONFIG_SND),y)
   obj-y += last.o
 endif

diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c
new file mode 100644 (file)
index 0000000..66de2c2
--- /dev/null
+++ b/sound/ac97_bus.c
@@ -0,0 +1,72 @@
+/*
+ * Linux driver model AC97 bus interface
+ *
+ * Author:     Nicolas Pitre
+ * Created:    Jan 14, 2005
+ * Copyright:  (C) MontaVista Software Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/string.h>
+
+/*
+ * Let drivers decide whether they want to support given codec from their
+ * probe method.  Drivers have direct access to the struct snd_ac97 structure and may
+ * decide based on the id field amongst other things.
+ */
+static int ac97_bus_match(struct device *dev, struct device_driver *drv)
+{
+       return 1;
+}
+
+static int ac97_bus_suspend(struct device *dev, pm_message_t state)
+{
+       int ret = 0;
+
+       if (dev->driver && dev->driver->suspend)
+               ret = dev->driver->suspend(dev, state);
+
+       return ret;
+}
+
+static int ac97_bus_resume(struct device *dev)
+{
+       int ret = 0;
+
+       if (dev->driver && dev->driver->resume)
+               ret = dev->driver->resume(dev);
+
+       return ret;
+}
+
+struct bus_type ac97_bus_type = {
+       .name           = "ac97",
+       .match          = ac97_bus_match,
+       .suspend        = ac97_bus_suspend,
+       .resume         = ac97_bus_resume,
+};
+
+static int __init ac97_bus_init(void)
+{
+       return bus_register(&ac97_bus_type);
+}
+
+subsys_initcall(ac97_bus_init);
+
+static void __exit ac97_bus_exit(void)
+{
+       bus_unregister(&ac97_bus_type);
+}
+
+module_exit(ac97_bus_exit);
+
+EXPORT_SYMBOL(ac97_bus_type);
+
+MODULE_LICENSE("GPL");

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 7971285dfd5b9a75ce796c927df888072af482d6..40ebd2f440562145989e02f3d55fce723f74d4d3 100644 (file)
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -26,11 +26,7 @@ config SND_VX_LIB
 config SND_AC97_CODEC
        tristate
        select SND_PCM
-       select SND_AC97_BUS
-
-config SND_AC97_BUS
-       tristate
-
+       select AC97_BUS
 
 config SND_DUMMY
        tristate "Dummy (/dev/null) soundcard"

diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index 77b3482cb1332fe29f92ec9d9c249f5ec1f0d6df..3c3222122d8b0acda0e1a4389ee8fa452da0409d 100644 (file)
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -10,11 +10,9 @@ snd-ac97-codec-objs += ac97_proc.o
 endif
 
 snd-ak4531-codec-objs := ak4531_codec.o
-snd-ac97-bus-objs := ac97_bus.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o
 obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o
-obj-$(CONFIG_SND_AC97_BUS) += snd-ac97-bus.o
 
 obj-m := $(sort $(obj-m))

diff --git a/sound/pci/ac97/ac97_bus.c b/sound/pci/ac97/ac97_bus.c
deleted file mode 100644 (file)
index 66de2c2..0000000
--- a/sound/pci/ac97/ac97_bus.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Linux driver model AC97 bus interface
- *
- * Author:     Nicolas Pitre
- * Created:    Jan 14, 2005
- * Copyright:  (C) MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/string.h>
-
-/*
- * Let drivers decide whether they want to support given codec from their
- * probe method.  Drivers have direct access to the struct snd_ac97 structure and may
- * decide based on the id field amongst other things.
- */
-static int ac97_bus_match(struct device *dev, struct device_driver *drv)
-{
-       return 1;
-}
-
-static int ac97_bus_suspend(struct device *dev, pm_message_t state)
-{
-       int ret = 0;
-
-       if (dev->driver && dev->driver->suspend)
-               ret = dev->driver->suspend(dev, state);
-
-       return ret;
-}
-
-static int ac97_bus_resume(struct device *dev)
-{
-       int ret = 0;
-
-       if (dev->driver && dev->driver->resume)
-               ret = dev->driver->resume(dev);
-
-       return ret;
-}
-
-struct bus_type ac97_bus_type = {
-       .name           = "ac97",
-       .match          = ac97_bus_match,
-       .suspend        = ac97_bus_suspend,
-       .resume         = ac97_bus_resume,
-};
-
-static int __init ac97_bus_init(void)
-{
-       return bus_register(&ac97_bus_type);
-}
-
-subsys_initcall(ac97_bus_init);
-
-static void __exit ac97_bus_exit(void)
-{
-       bus_unregister(&ac97_bus_type);
-}
-
-module_exit(ac97_bus_exit);
-
-EXPORT_SYMBOL(ac97_bus_type);
-
-MODULE_LICENSE("GPL");