Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4ebd017 authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[POWERPC] Init markings for celleb 



There are some variables and functions that we should place in init
section.  And this patch changes some '__devinit' to '__init', because
the device is platform device and not hot-pluggable.

Signed-off-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b090b338

arch/powerpc/platforms/celleb/scc_epci.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ struct pci_ops celleb_epci_ops = { 
};



/* to be moved in FW */

static int __devinit celleb_epci_init(struct pci_controller *hose)

static int __init celleb_epci_init(struct pci_controller *hose)

{

	u32 val;

	volatile void __iomem *reg, *epci_base;
@@ -403,7 +403,7 @@ static int __devinit celleb_epci_init(struct pci_controller *hose) 
	return 0;

}



int __devinit celleb_setup_epci(struct device_node *node,

int __init celleb_setup_epci(struct device_node *node,

				struct pci_controller *hose)

{

	struct resource r;

arch/powerpc/platforms/celleb/scc_sio.c

+3 −3
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ 


/* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024

    mmio=0xfff000-0x1000,0xff2000-0x1000 */

static int txx9_serial_bitmap = 0;

static int txx9_serial_bitmap __initdata = 0;



static struct {

	uint32_t offset;

	uint32_t index;

} txx9_scc_tab[3] = {

} txx9_scc_tab[3] __initdata = {

	{ 0x300, 0 },	/* 0xFFF300 */

	{ 0x400, 0 },	/* 0xFFF400 */

	{ 0x800, 1 }	/* 0xFF2800 */
@@ -79,7 +79,7 @@ static int __init txx9_serial_init(void) 
	return 0;

}



static int txx9_serial_config(char *ptr)

static int __init txx9_serial_config(char *ptr)

{

	int	i;

arch/powerpc/platforms/celleb/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void celleb_show_cpuinfo(struct seq_file *m) 
	of_node_put(root);

}



static int celleb_machine_type_hack(char *ptr)

static int __init celleb_machine_type_hack(char *ptr)

{

	strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type));

	celleb_machine_type[sizeof(celleb_machine_type)-1] = 0;
@@ -135,7 +135,7 @@ static void celleb_kexec_cpu_down(int crash, int secondary) 
}

#endif



static struct of_device_id celleb_bus_ids[] = {

static struct of_device_id celleb_bus_ids[] __initdata = {

	{ .type = "scc", },

	{ .type = "ioif", },	/* old style */

	{},