diff options
| author | Jonas Bonn <jonas@southpole.se> | 2010-07-23 14:19:24 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:58:22 -0400 |
| commit | c0dd394ca5e78649b7013c3ce2d6338af9f228f0 (patch) | |
| tree | ed1702f29368675d22fd31a7b00497674011e179 /arch/powerpc/kernel/of_platform.c | |
| parent | c608558407aa64d2b98d58bfc116e95c0afb357e (diff) | |
of: remove of_default_bus_ids
This list used was by only two platforms with all other platforms defining an
own list of valid bus id's to pass to of_platform_bus_probe. This patch:
i) copies the default list to the two platforms that depended on it (powerpc)
ii) remove the usage of of_default_bus_ids in of_platform_bus_probe
iii) removes the definition of the list from all architectures that defined it
Passing a NULL 'matches' parameter to of_platform_bus_probe is still valid; the
function returns no error in that case as the NULL value is equivalent to an
empty list.
Signed-off-by: Jonas Bonn <jonas@southpole.se>
[grant.likely@secretlab.ca: added __initdata annotations, warn on and return error on missing match table, and fix whitespace errors]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/kernel/of_platform.c')
| -rw-r--r-- | arch/powerpc/kernel/of_platform.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 760a7af7fdb..b2c363ef38a 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
| @@ -28,30 +28,6 @@ | |||
| 28 | #include <asm/ppc-pci.h> | 28 | #include <asm/ppc-pci.h> |
| 29 | #include <asm/atomic.h> | 29 | #include <asm/atomic.h> |
| 30 | 30 | ||
| 31 | /* | ||
| 32 | * The list of OF IDs below is used for matching bus types in the | ||
| 33 | * system whose devices are to be exposed as of_platform_devices. | ||
| 34 | * | ||
| 35 | * This is the default list valid for most platforms. This file provides | ||
| 36 | * functions who can take an explicit list if necessary though | ||
| 37 | * | ||
| 38 | * The search is always performed recursively looking for children of | ||
| 39 | * the provided device_node and recursively if such a children matches | ||
| 40 | * a bus type in the list | ||
| 41 | */ | ||
| 42 | |||
| 43 | const struct of_device_id of_default_bus_ids[] = { | ||
| 44 | { .type = "soc", }, | ||
| 45 | { .compatible = "soc", }, | ||
| 46 | { .type = "spider", }, | ||
| 47 | { .type = "axon", }, | ||
| 48 | { .type = "plb5", }, | ||
| 49 | { .type = "plb4", }, | ||
| 50 | { .type = "opb", }, | ||
| 51 | { .type = "ebc", }, | ||
| 52 | {}, | ||
| 53 | }; | ||
| 54 | |||
| 55 | #ifdef CONFIG_PPC_OF_PLATFORM_PCI | 31 | #ifdef CONFIG_PPC_OF_PLATFORM_PCI |
| 56 | 32 | ||
| 57 | /* The probing of PCI controllers from of_platform is currently | 33 | /* The probing of PCI controllers from of_platform is currently |
