[U-Boot] [PATCH 22/51] gdsys: mpc8308: Fix style violations

14 Jul 2017

Fix some style violations in the gdsys MPC8308 board files, and make the
code more readable.
Signed-off-by: Mario Six mario.six@gdsys.cc
---
board/gdsys/mpc8308/hrcon.c   | 55 ++++++++++++++++++++++---------------------
 board/gdsys/mpc8308/mpc8308.c | 12 +++++-----
 board/gdsys/mpc8308/strider.c | 49 +++++++++++++++++++-------------------
 3 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index c6566e9196..e8898a793a 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/board/gdsys/mpc8308/hrcon.c
@@ -38,11 +38,11 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MAX_MUX_CHANNELS 2
enum {
-	MCFPGA_DONE = 1 << 0,
-	MCFPGA_INIT_N = 1 << 1,
-	MCFPGA_PROGRAM_N = 1 << 2,
-	MCFPGA_UPDATE_ENABLE_N = 1 << 3,
-	MCFPGA_RESET_N = 1 << 4,
+	MCFPGA_DONE = BIT(0),
+	MCFPGA_INIT_N = BIT(1),
+	MCFPGA_PROGRAM_N = BIT(2),
+	MCFPGA_UPDATE_ENABLE_N = BIT(3),
+	MCFPGA_RESET_N = BIT(4),
 };
enum {
@@ -50,7 +50,7 @@ enum {
    GPIO_MDIO = 1 << 15,
 };
-unsigned int mclink_fpgacount;
+uint mclink_fpgacount;
 struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
struct {
@@ -110,7 +110,7 @@ int checkboard(void)
printf("HRCon %s", hw_type_cat ? "CAT" : "Fiber");
-	if (s != NULL) {
+	if (s) {
    	puts(", serial# ");
    	puts(s);
    }
@@ -123,12 +123,11 @@ int checkboard(void)
 int last_stage_init(void)
 {
    int slaves;
-	unsigned int k;
-	unsigned int mux_ch;
-	unsigned char mclink_controllers[] = { 0x3c, 0x3d, 0x3e };
+	uint k;
+	uchar mclink_controllers[] = { 0x3c, 0x3d, 0x3e };
    u16 fpga_features;
    bool hw_type_cat = pca9698_get_value(0x20, 20);
-	bool ch0_rgmii2_present = false;
+	bool ch0_rgmii2_present;
FPGA_GET_REG(0, fpga_features, &fpga_features);
@@ -140,16 +139,16 @@ int last_stage_init(void)
/* wait for FPGA done, then reset FPGA */
    for (k = 0; k < ARRAY_SIZE(mclink_controllers); ++k) {
-		unsigned int ctr = 0;
+		uint ctr = 0;
if (i2c_probe(mclink_controllers[k]))
    		continue;
while (!(pca953x_get_val(mclink_controllers[k])
    	       & MCFPGA_DONE)) {
-			udelay(100000);
+			mdelay(100);
    		if (ctr++ > 5) {
-				printf("no done for mclink_controller %d\n", k);
+				printf("no done for mclink_controller %u\n", k);
    			break;
    		}
    	}
@@ -162,8 +161,10 @@ int last_stage_init(void)
    }
if (hw_type_cat) {
+		uint mux_ch;
    	int retval;
    	struct mii_dev *mdiodev = mdio_alloc();
+
    	if (!mdiodev)
    		return -ENOMEM;
    	strncpy(mdiodev->name, bb_miiphy_buses[0].name, MDIO_NAME_LEN);
@@ -182,7 +183,7 @@ int last_stage_init(void)
    }
/* give slave-PLLs and Parade DP501 some time to be up and running */
-	udelay(500000);
+	mdelay(500);
mclink_fpgacount = CONFIG_SYS_MCLINK_MAX;
    slaves = mclink_probe();
@@ -210,6 +211,7 @@ int last_stage_init(void)
    	if (hw_type_cat) {
    		int retval;
    		struct mii_dev *mdiodev = mdio_alloc();
+
    		if (!mdiodev)
    			return -ENOMEM;
    		strncpy(mdiodev->name, bb_miiphy_buses[k].name,
@@ -236,17 +238,17 @@ int last_stage_init(void)
  * provide access to fpga gpios and controls (for I2C bitbang)
  * (these may look all too simple but make iocon.h much more readable)
  */
-void fpga_gpio_set(unsigned int bus, int pin)
+void fpga_gpio_set(uint bus, int pin)
 {
    FPGA_SET_REG(bus >= 4 ? (bus - 4) : bus, gpio.set, pin);
 }
-void fpga_gpio_clear(unsigned int bus, int pin)
+void fpga_gpio_clear(uint bus, int pin)
 {
    FPGA_SET_REG(bus >= 4 ? (bus - 4) : bus, gpio.clear, pin);
 }
-int fpga_gpio_get(unsigned int bus, int pin)
+int fpga_gpio_get(uint bus, int pin)
 {
    u16 val;
@@ -255,7 +257,7 @@ int fpga_gpio_get(unsigned int bus, int pin)
    return val & pin;
 }
-void fpga_control_set(unsigned int bus, int pin)
+void fpga_control_set(uint bus, int pin)
 {
    u16 val;
@@ -263,7 +265,7 @@ void fpga_control_set(unsigned int bus, int pin)
    FPGA_SET_REG(bus >= 4 ? (bus - 4) : bus, control, val | pin);
 }
-void fpga_control_clear(unsigned int bus, int pin)
+void fpga_control_clear(uint bus, int pin)
 {
    u16 val;
@@ -276,7 +278,7 @@ void mpc8308_init(void)
    pca9698_direction_output(0x20, 4, 1);
 }
-void mpc8308_set_fpga_reset(unsigned state)
+void mpc8308_set_fpga_reset(uint state)
 {
    pca9698_set_value(0x20, 4, state ? 0 : 1);
 }
@@ -288,11 +290,11 @@ void mpc8308_setup_hw(void)
    /*
     * set "startup-finished"-gpios
     */
-	setbits_be32(&immr->gpio[0].dir, (1 << (31-11)) | (1 << (31-12)));
-	setbits_be32(&immr->gpio[0].dat, 1 << (31-12));
+	setbits_be32(&immr->gpio[0].dir, (BIT(31 - 11) | BIT(31 - 12)));
+	setbits_be32(&immr->gpio[0].dat, BIT(31 - 12));
 }
-int mpc8308_get_fpga_done(unsigned fpga)
+int mpc8308_get_fpga_done(uint fpga)
 {
    return pca9698_get_value(0x20, 19);
 }
@@ -370,7 +372,7 @@ int ft_board_setup(void *blob, bd_t *bd)
  */
struct fpga_mii {
-	unsigned fpga;
+	uint fpga;
    int mdio;
 } fpga_mii[] = {
    { 0, 1},
@@ -497,5 +499,4 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
    },
 };
-int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
-			  sizeof(bb_miiphy_buses[0]);
+int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c
index 86b257f4de..0b1d4eab22 100644
--- a/board/gdsys/mpc8308/mpc8308.c
+++ b/board/gdsys/mpc8308/mpc8308.c
@@ -25,14 +25,14 @@
DECLARE_GLOBAL_DATA_PTR;
-int get_fpga_state(unsigned dev)
+int get_fpga_state(uint dev)
 {
    return gd->arch.fpga_state[dev];
 }
int board_early_init_f(void)
 {
-	unsigned k;
+	uint k;
for (k = 0; k < CONFIG_SYS_FPGA_COUNT; ++k)
    	gd->arch.fpga_state[k] = 0;
@@ -42,8 +42,8 @@ int board_early_init_f(void)
int board_early_init_r(void)
 {
-	unsigned k;
-	unsigned ctr;
+	uint k;
+	uint ctr;
for (k = 0; k < CONFIG_SYS_FPGA_COUNT; ++k)
    	gd->arch.fpga_state[k] = 0;
@@ -60,7 +60,7 @@ int board_early_init_r(void)
    for (k = 0; k < CONFIG_SYS_FPGA_COUNT; ++k) {
    	ctr = 0;
    	while (!mpc8308_get_fpga_done(k)) {
-			udelay(100000);
+			mdelay(100);
    		if (ctr++ > 5) {
    			gd->arch.fpga_state[k] |=
    				FPGA_STATE_DONE_FAILED;
@@ -87,7 +87,7 @@ int board_early_init_r(void)
    		if (val == REFLECTION_TESTPATTERN_INV)
    			break;
-			udelay(100000);
+			mdelay(100);
    		if (ctr++ > 5) {
    			gd->arch.fpga_state[k] |=
    				FPGA_STATE_REFLECTION_FAILED;
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index 34e9d1956e..5197d22f07 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/board/gdsys/mpc8308/strider.c
@@ -53,7 +53,7 @@ enum {
    GPIO_MDIO = 1 << 15,
 };
-unsigned int mclink_fpgacount;
+uint mclink_fpgacount;
 struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
struct {
@@ -113,7 +113,7 @@ int checkboard(void)
printf("Strider %s", hw_type_cat ? "CAT" : "Fiber");
-	if (s != NULL) {
+	if (s) {
    	puts(", serial# ");
    	puts(s);
    }
@@ -126,17 +126,17 @@ int checkboard(void)
 int last_stage_init(void)
 {
    int slaves;
-	unsigned int k;
-	unsigned int mux_ch;
-	unsigned char mclink_controllers_dvi[] = { 0x3c, 0x3d, 0x3e };
+	uint k;
+	uint mux_ch;
+	uchar mclink_controllers_dvi[] = { 0x3c, 0x3d, 0x3e };
 #ifdef CONFIG_STRIDER_CPU
-	unsigned char mclink_controllers_dp[] = { 0x24, 0x25, 0x26 };
+	uchar mclink_controllers_dp[] = { 0x24, 0x25, 0x26 };
 #endif
    bool hw_type_cat = pca9698_get_value(0x20, 18);
 #ifdef CONFIG_STRIDER_CON_DP
    bool is_dh = pca9698_get_value(0x20, 25);
 #endif
-	bool ch0_sgmii2_present = false;
+	bool ch0_sgmii2_present;
/* Turn on Analog Devices ADV7611 */
    pca9698_direction_output(0x20, 8, 0);
@@ -149,8 +149,8 @@ int last_stage_init(void)
/* wait for FPGA done, then reset FPGA */
    for (k = 0; k < ARRAY_SIZE(mclink_controllers_dvi); ++k) {
-		unsigned int ctr = 0;
-		unsigned char *mclink_controllers = mclink_controllers_dvi;
+		uint ctr = 0;
+		uchar *mclink_controllers = mclink_controllers_dvi;
#ifdef CONFIG_STRIDER_CPU
    	if (i2c_probe(mclink_controllers[k])) {
@@ -164,7 +164,7 @@ int last_stage_init(void)
 #endif
    	while (!(pca953x_get_val(mclink_controllers[k])
    	       & MCFPGA_DONE)) {
-			udelay(100000);
+			mdelay(100);
    		if (ctr++ > 5) {
    			printf("no done for mclink_controller %d\n", k);
    			break;
@@ -181,6 +181,7 @@ int last_stage_init(void)
    if (hw_type_cat) {
    	int retval;
    	struct mii_dev *mdiodev = mdio_alloc();
+
    	if (!mdiodev)
    		return -ENOMEM;
    	strncpy(mdiodev->name, bb_miiphy_buses[0].name, MDIO_NAME_LEN);
@@ -199,7 +200,7 @@ int last_stage_init(void)
    }
/* give slave-PLLs and Parade DP501 some time to be up and running */
-	udelay(500000);
+	mdelay(500);
mclink_fpgacount = CONFIG_SYS_MCLINK_MAX;
    slaves = mclink_probe();
@@ -238,7 +239,7 @@ int last_stage_init(void)
    for (k = 1; k <= slaves; ++k)
    	FPGA_SET_REG(k, extended_control, 0x10); /* enable video */
-	udelay(500000);
+	mdelay(500);
 #endif
for (k = 1; k <= slaves; ++k) {
@@ -263,6 +264,7 @@ int last_stage_init(void)
    	if (hw_type_cat) {
    		int retval;
    		struct mii_dev *mdiodev = mdio_alloc();
+
    		if (!mdiodev)
    			return -ENOMEM;
    		strncpy(mdiodev->name, bb_miiphy_buses[k].name,
@@ -289,17 +291,17 @@ int last_stage_init(void)
  * provide access to fpga gpios (for I2C bitbang)
  * (these may look all too simple but make iocon.h much more readable)
  */
-void fpga_gpio_set(unsigned int bus, int pin)
+void fpga_gpio_set(uint bus, int pin)
 {
    FPGA_SET_REG(bus, gpio.set, pin);
 }
-void fpga_gpio_clear(unsigned int bus, int pin)
+void fpga_gpio_clear(uint bus, int pin)
 {
    FPGA_SET_REG(bus, gpio.clear, pin);
 }
-int fpga_gpio_get(unsigned int bus, int pin)
+int fpga_gpio_get(uint bus, int pin)
 {
    u16 val;
@@ -309,7 +311,7 @@ int fpga_gpio_get(unsigned int bus, int pin)
 }
#ifdef CONFIG_STRIDER_CON_DP
-void fpga_control_set(unsigned int bus, int pin)
+void fpga_control_set(uint bus, int pin)
 {
    u16 val;
@@ -317,7 +319,7 @@ void fpga_control_set(unsigned int bus, int pin)
    FPGA_SET_REG(bus, control, val | pin);
 }
-void fpga_control_clear(unsigned int bus, int pin)
+void fpga_control_clear(uint bus, int pin)
 {
    u16 val;
@@ -331,7 +333,7 @@ void mpc8308_init(void)
    pca9698_direction_output(0x20, 26, 1);
 }
-void mpc8308_set_fpga_reset(unsigned state)
+void mpc8308_set_fpga_reset(uint state)
 {
    pca9698_set_value(0x20, 26, state ? 0 : 1);
 }
@@ -343,11 +345,11 @@ void mpc8308_setup_hw(void)
    /*
     * set "startup-finished"-gpios
     */
-	setbits_be32(&immr->gpio[0].dir, (1 << (31-11)) | (1 << (31-12)));
-	setbits_be32(&immr->gpio[0].dat, 1 << (31-12));
+	setbits_be32(&immr->gpio[0].dir, BIT(31 - 11) | BIT(31 - 12));
+	setbits_be32(&immr->gpio[0].dat, BIT(31 - 12));
 }
-int mpc8308_get_fpga_done(unsigned fpga)
+int mpc8308_get_fpga_done(uint fpga)
 {
    return pca9698_get_value(0x20, 20);
 }
@@ -425,7 +427,7 @@ int ft_board_setup(void *blob, bd_t *bd)
  */
struct fpga_mii {
-	unsigned fpga;
+	uint fpga;
    int mdio;
 } fpga_mii[] = {
    { 0, 1},
@@ -552,5 +554,4 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
    },
 };
-int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
-			  sizeof(bb_miiphy_buses[0]);
+int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
-- 
2.11.0


    