[POWERPC] cell: Use machine_*_initcall() hooks in platform code (e25c47ff) · Commits · 戴 / test

arch/powerpc/platforms/cell/io-workarounds.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -309,9 +309,6 @@ static int __init spider_pci_workaround_init(void)
		{
		struct pci_controller *phb;

		if (!machine_is(cell))
		return 0;

		/* Find spider bridges. We assume they have been all probed
		* in setup_arch(). If that was to change, we would need to
		* update this code to cope with dynamically added busses
		@@ -343,4 +340,4 @@ static int __init spider_pci_workaround_init(void)

		return 0;
		}
		arch_initcall(spider_pci_workaround_init);
		machine_arch_initcall(cell, spider_pci_workaround_init);

+2 −5

Original line number	Diff line number	Diff line
		@@ -700,10 +700,6 @@ static int __init cell_iommu_init(void)
		{
		struct device_node *np;

		if (!machine_is(cell) &&
		!machine_is(celleb_native))
		return -ENODEV;

		/* If IOMMU is disabled or we have little enough RAM to not need
		* to enable it, we setup a direct mapping.
		*
		@@ -746,5 +742,6 @@ static int __init cell_iommu_init(void)

		return 0;
		}
		arch_initcall(cell_iommu_init);
		machine_arch_initcall(cell, cell_iommu_init);
		machine_arch_initcall(celleb_native, cell_iommu_init);

+1 −4

Original line number	Diff line number	Diff line
		@@ -381,9 +381,6 @@ static int __init cbe_init_pm_irq(void)
		unsigned int irq;
		int rc, node;

		if (!machine_is(cell))
		return 0;

		for_each_node(node) {
		irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI \|
		(node << IIC_IRQ_NODE_SHIFT));
		@@ -404,7 +401,7 @@ static int __init cbe_init_pm_irq(void)

		return 0;
		}
		arch_initcall(cbe_init_pm_irq);
		machine_arch_initcall(cell, cbe_init_pm_irq);

		void cbe_sync_irq(int node)
		{

+1 −4

Original line number	Diff line number	Diff line
		@@ -85,9 +85,6 @@ static int __init cell_publish_devices(void)
		{
		int node;

		if (!machine_is(cell))
		return 0;

		/* Publish OF platform devices for southbridge IOs */
		of_platform_bus_probe(NULL, NULL, NULL);

		@@ -101,7 +98,7 @@ static int __init cell_publish_devices(void)
		}
		return 0;
		}
		device_initcall(cell_publish_devices);
		machine_device_initcall(cell, cell_publish_devices);

		static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
		{

+1 −4

Original line number	Diff line number	Diff line
		@@ -92,9 +92,6 @@ static struct notifier_block celleb_of_bus_notifier = {

		static int __init celleb_init_iommu(void)
		{
		if (!machine_is(celleb_beat))
		return -ENODEV;

		celleb_init_direct_mapping();
		set_pci_dma_ops(&dma_direct_ops);
		bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
		@@ -102,4 +99,4 @@ static int __init celleb_init_iommu(void)
		return 0;
		}

		arch_initcall(celleb_init_iommu);
		machine_arch_initcall(celleb_beat, celleb_init_iommu);