of: Merge of_platform_bus_type with platform_bus_type
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 8 Jun 2010 13:48:21 +0000 (07:48 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:57:51 +0000 (09:57 -0600)
commiteca3930163ba8884060ce9d9ff5ef0d9b7c7b00f
tree5774d6d53b5f7d8f069e82b3937cdff7b3d45bbe
parent05212157e94ccf4cf458413bbba509cfa95ff92b
of: Merge of_platform_bus_type with platform_bus_type

of_platform_bus was being used in the same manner as the platform_bus.
The only difference being that of_platform_bus devices are generated
from data in the device tree, and platform_bus devices are usually
statically allocated in platform code.  Having them separate causes
the problem of device drivers having to be registered twice if it
was possible for the same device to appear on either bus.

This patch removes of_platform_bus_type and registers all of_platform
bus devices and drivers on the platform bus instead.  A previous patch
made the of_device structure an alias for the platform_device structure,
and a shim is used to adapt of_platform_drivers to the platform bus.

After all of of_platform_bus drivers are converted to be normal platform
drivers, the shim code can be removed.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
16 files changed:
arch/microblaze/kernel/of_platform.c
arch/microblaze/kernel/setup.c
arch/powerpc/kernel/dma-swiotlb.c
arch/powerpc/kernel/of_platform.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/platforms/cell/beat_iommu.c
arch/powerpc/platforms/cell/iommu.c
arch/powerpc/sysdev/mv64x60_dev.c
arch/sparc/kernel/of_device_32.c
arch/sparc/kernel/of_device_64.c
arch/sparc/kernel/of_device_common.c
drivers/base/platform.c
drivers/of/device.c
drivers/of/platform.c
include/linux/of_device.h
include/linux/of_platform.h