Commit 7c4b4773 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Sibyte: cleanup static inline forward declarations. 



In fact there are no foward declarations at all needed when moving things
into the right order.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e5d77754

arch/mips/sibyte/bcm1480/setup.c

+39 −39
Original line number Diff line number Diff line
@@ -43,11 +43,44 @@ static unsigned int part_type; 
static char *soc_str;

static char *pass_str;



static inline int setup_bcm1x80_bcm1x55(void);

static int __init setup_bcm1x80_bcm1x55(void)

{

	int ret = 0;



	switch (soc_pass) {

	case K_SYS_REVISION_BCM1480_S0:

		periph_rev = 1;

		pass_str = "S0 (pass1)";

		break;

	case K_SYS_REVISION_BCM1480_A1:

		periph_rev = 1;

		pass_str = "A1 (pass1)";

		break;

	case K_SYS_REVISION_BCM1480_A2:

		periph_rev = 1;

		pass_str = "A2 (pass1)";

		break;

	case K_SYS_REVISION_BCM1480_A3:

		periph_rev = 1;

		pass_str = "A3 (pass1)";

		break;

	case K_SYS_REVISION_BCM1480_B0:

		periph_rev = 1;

		pass_str = "B0 (pass2)";

		break;

	default:

		printk("Unknown %s rev %x\n", soc_str, soc_pass);

		periph_rev = 1;

		pass_str = "Unknown Revision";

		break;

	}



	return ret;

}



/* Setup code likely to be common to all SiByte platforms */



static inline int sys_rev_decode(void)

static int __init sys_rev_decode(void)

{

	int ret = 0;
@@ -77,44 +110,11 @@ static inline int sys_rev_decode(void) 
		ret = 1;

		break;

	}

	return ret;

}



static inline int setup_bcm1x80_bcm1x55(void)

{

	int ret = 0;



	switch (soc_pass) {

	    case K_SYS_REVISION_BCM1480_S0:

		periph_rev = 1;

		pass_str = "S0 (pass1)";

		break;

	    case K_SYS_REVISION_BCM1480_A1:

		periph_rev = 1;

		pass_str = "A1 (pass1)";

		break;

	    case K_SYS_REVISION_BCM1480_A2:

		periph_rev = 1;

		pass_str = "A2 (pass1)";

		break;

	    case K_SYS_REVISION_BCM1480_A3:

		periph_rev = 1;

		pass_str = "A3 (pass1)";

		break;

	    case K_SYS_REVISION_BCM1480_B0:

		periph_rev = 1;

		pass_str = "B0 (pass2)";

		break;

	    default:

		printk("Unknown %s rev %x\n", soc_str, soc_pass);

		periph_rev = 1;

		pass_str = "Unknown Revision";

		break;

	}

	return ret;

}



void bcm1480_setup(void)

void __init bcm1480_setup(void)

{

	uint64_t sys_rev;

	int plldiv;

arch/mips/sibyte/sb1250/setup.c

+37 −37
Original line number Diff line number Diff line
@@ -40,43 +40,6 @@ static char *soc_str; 
static char *pass_str;

static unsigned int war_pass;	/* XXXKW don't overload PASS defines? */



static inline int setup_bcm1250(void);

static inline int setup_bcm112x(void);



/* Setup code likely to be common to all SiByte platforms */



static int __init sys_rev_decode(void)

{

	int ret = 0;



	war_pass = soc_pass;

	switch (soc_type) {

	case K_SYS_SOC_TYPE_BCM1250:

	case K_SYS_SOC_TYPE_BCM1250_ALT:

	case K_SYS_SOC_TYPE_BCM1250_ALT2:

		soc_str = "BCM1250";

		ret = setup_bcm1250();

		break;

	case K_SYS_SOC_TYPE_BCM1120:

		soc_str = "BCM1120";

		ret = setup_bcm112x();

		break;

	case K_SYS_SOC_TYPE_BCM1125:

		soc_str = "BCM1125";

		ret = setup_bcm112x();

		break;

	case K_SYS_SOC_TYPE_BCM1125H:

		soc_str = "BCM1125H";

		ret = setup_bcm112x();

		break;

	default:

		printk("Unknown SOC type %x\n", soc_type);

		ret = 1;

		break;

	}

	return ret;

}



static int __init setup_bcm1250(void)

{

	int ret = 0;
@@ -120,6 +83,7 @@ static int __init setup_bcm1250(void) 
		}

		break;

	}



	return ret;

}
@@ -158,6 +122,42 @@ static int __init setup_bcm112x(void) 
		printk("Unknown %s rev %x\n", soc_str, soc_pass);

		ret = 1;

	}



	return ret;

}



/* Setup code likely to be common to all SiByte platforms */



static int __init sys_rev_decode(void)

{

	int ret = 0;



	war_pass = soc_pass;

	switch (soc_type) {

	case K_SYS_SOC_TYPE_BCM1250:

	case K_SYS_SOC_TYPE_BCM1250_ALT:

	case K_SYS_SOC_TYPE_BCM1250_ALT2:

		soc_str = "BCM1250";

		ret = setup_bcm1250();

		break;

	case K_SYS_SOC_TYPE_BCM1120:

		soc_str = "BCM1120";

		ret = setup_bcm112x();

		break;

	case K_SYS_SOC_TYPE_BCM1125:

		soc_str = "BCM1125";

		ret = setup_bcm112x();

		break;

	case K_SYS_SOC_TYPE_BCM1125H:

		soc_str = "BCM1125H";

		ret = setup_bcm112x();

		break;

	default:

		printk("Unknown SOC type %x\n", soc_type);

		ret = 1;

		break;

	}



	return ret;

}