forked from luck/tmp_suning_uos_patched
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
173 lines
4.3 KiB
C
173 lines
4.3 KiB
C
/*
|
|
* OF helpers for ALSA SoC Layer
|
|
*
|
|
* Copyright (C) 2008, Secret Lab Technologies Ltd.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/init.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/slab.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/pcm_params.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-of-simple.h>
|
|
#include <sound/initval.h>
|
|
|
|
MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("ALSA SoC OpenFirmware bindings");
|
|
|
|
static DEFINE_MUTEX(of_snd_soc_mutex);
|
|
static LIST_HEAD(of_snd_soc_device_list);
|
|
static int of_snd_soc_next_index;
|
|
|
|
struct of_snd_soc_device {
|
|
int id;
|
|
struct list_head list;
|
|
struct snd_soc_device device;
|
|
struct snd_soc_card card;
|
|
struct snd_soc_dai_link dai_link;
|
|
struct platform_device *pdev;
|
|
struct device_node *platform_node;
|
|
struct device_node *codec_node;
|
|
};
|
|
|
|
static struct snd_soc_ops of_snd_soc_ops = {
|
|
};
|
|
|
|
static struct of_snd_soc_device *
|
|
of_snd_soc_get_device(struct device_node *codec_node)
|
|
{
|
|
struct of_snd_soc_device *of_soc;
|
|
|
|
list_for_each_entry(of_soc, &of_snd_soc_device_list, list) {
|
|
if (of_soc->codec_node == codec_node)
|
|
return of_soc;
|
|
}
|
|
|
|
of_soc = kzalloc(sizeof(struct of_snd_soc_device), GFP_KERNEL);
|
|
if (!of_soc)
|
|
return NULL;
|
|
|
|
/* Initialize the structure and add it to the global list */
|
|
of_soc->codec_node = codec_node;
|
|
of_soc->id = of_snd_soc_next_index++;
|
|
of_soc->card.dai_link = &of_soc->dai_link;
|
|
of_soc->card.num_links = 1;
|
|
of_soc->device.card = &of_soc->card;
|
|
of_soc->dai_link.ops = &of_snd_soc_ops;
|
|
list_add(&of_soc->list, &of_snd_soc_device_list);
|
|
|
|
return of_soc;
|
|
}
|
|
|
|
static void of_snd_soc_register_device(struct of_snd_soc_device *of_soc)
|
|
{
|
|
struct platform_device *pdev;
|
|
int rc;
|
|
|
|
/* Only register the device if both the codec and platform have
|
|
* been registered */
|
|
if ((!of_soc->device.codec_data) || (!of_soc->platform_node))
|
|
return;
|
|
|
|
pr_info("platform<-->codec match achieved; registering machine\n");
|
|
|
|
pdev = platform_device_alloc("soc-audio", of_soc->id);
|
|
if (!pdev) {
|
|
pr_err("of_soc: platform_device_alloc() failed\n");
|
|
return;
|
|
}
|
|
|
|
pdev->dev.platform_data = of_soc;
|
|
platform_set_drvdata(pdev, &of_soc->device);
|
|
of_soc->device.dev = &pdev->dev;
|
|
|
|
/* The ASoC device is complete; register it */
|
|
rc = platform_device_add(pdev);
|
|
if (rc) {
|
|
pr_err("of_soc: platform_device_add() failed\n");
|
|
return;
|
|
}
|
|
|
|
}
|
|
|
|
int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev,
|
|
void *codec_data, struct snd_soc_dai *dai,
|
|
struct device_node *node)
|
|
{
|
|
struct of_snd_soc_device *of_soc;
|
|
int rc = 0;
|
|
|
|
pr_info("registering ASoC codec driver: %s\n", node->full_name);
|
|
|
|
mutex_lock(&of_snd_soc_mutex);
|
|
of_soc = of_snd_soc_get_device(node);
|
|
if (!of_soc) {
|
|
rc = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
/* Store the codec data */
|
|
of_soc->device.codec_data = codec_data;
|
|
of_soc->device.codec_dev = codec_dev;
|
|
of_soc->dai_link.name = (char *)node->name;
|
|
of_soc->dai_link.stream_name = (char *)node->name;
|
|
of_soc->dai_link.codec_dai = dai;
|
|
|
|
/* Now try to register the SoC device */
|
|
of_snd_soc_register_device(of_soc);
|
|
|
|
out:
|
|
mutex_unlock(&of_snd_soc_mutex);
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_snd_soc_register_codec);
|
|
|
|
int of_snd_soc_register_platform(struct snd_soc_platform *platform,
|
|
struct device_node *node,
|
|
struct snd_soc_dai *cpu_dai)
|
|
{
|
|
struct of_snd_soc_device *of_soc;
|
|
struct device_node *codec_node;
|
|
const phandle *handle;
|
|
int len, rc = 0;
|
|
|
|
pr_info("registering ASoC platform driver: %s\n", node->full_name);
|
|
|
|
handle = of_get_property(node, "codec-handle", &len);
|
|
if (!handle || len < sizeof(handle))
|
|
return -ENODEV;
|
|
codec_node = of_find_node_by_phandle(*handle);
|
|
if (!codec_node)
|
|
return -ENODEV;
|
|
pr_info("looking for codec: %s\n", codec_node->full_name);
|
|
|
|
mutex_lock(&of_snd_soc_mutex);
|
|
of_soc = of_snd_soc_get_device(codec_node);
|
|
if (!of_soc) {
|
|
rc = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
of_soc->platform_node = node;
|
|
of_soc->dai_link.cpu_dai = cpu_dai;
|
|
of_soc->card.platform = platform;
|
|
of_soc->card.name = of_soc->dai_link.cpu_dai->name;
|
|
|
|
/* Now try to register the SoC device */
|
|
of_snd_soc_register_device(of_soc);
|
|
|
|
out:
|
|
mutex_unlock(&of_snd_soc_mutex);
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL_GPL(of_snd_soc_register_platform);
|