- Try to bring these files closer to style(9).

- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.

1 files changed, 16 insertions, 17 deletions

diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index bbd0ac9..86095b9 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -180,9 +180,8 @@ at91_pmc_set_pllb_mode(struct at91_pmc_clock *clk, int on)
 	if (on) {
 		on = PMC_IER_LOCKB;
 		value = sc->pllb_init;
-	} else {
+	} else
 		value = 0;
-	}
 
 	/* Workaround RM9200 Errata #26 */
 	if (at91_is_rm92() &&
@@ -232,12 +231,12 @@ at91_pmc_clock_add(const char *name, uint32_t irq, struct at91_pmc_clock *parent
 	int i, buflen;
 
 	clk = malloc(sizeof(*clk), M_PMC, M_NOWAIT | M_ZERO);
-	if (clk == NULL) 
+	if (clk == NULL)
 		goto err;
 
 	buflen = strlen(name) + 1;
 	clk->name = malloc(buflen, M_PMC, M_NOWAIT);
-	if (clk->name == NULL) 
+	if (clk->name == NULL)
 		goto err;
 
 	strlcpy(clk->name, name, buflen);
@@ -256,7 +255,7 @@ at91_pmc_clock_add(const char *name, uint32_t irq, struct at91_pmc_clock *parent
 	}
 err:
 	if (clk != NULL) {
-		if (clk->name != NULL) 
+		if (clk->name != NULL)
 			free(clk->name, M_PMC);
 		free(clk, M_PMC);
 	}
@@ -331,15 +330,16 @@ at91_pmc_pll_rate(struct at91_pmc_clock *clk, uint32_t reg)
 	div = (reg >> clk->pll_div_shift) & clk->pll_div_mask;
 	mul = (reg >> clk->pll_mul_shift) & clk->pll_mul_mask;
 
-//	printf("pll = (%d /  %d) * %d = %d\n",
-//	    freq, div ,mul + 1, (freq/div) * (mul+1));
+#if 0
+	printf("pll = (%d /  %d) * %d = %d\n",
+	    freq, div, mul + 1, (freq/div) * (mul+1));
+#endif
 
 	if (div != 0 && mul != 0) {
 		freq /= div;
 		freq *= mul + 1;
-	} else {
+	} else
 		freq = 0;
-	}
 	clk->hz = freq;
 
 
@@ -431,9 +431,8 @@ at91_pmc_init_clock(struct at91_pmc_softc *sc, unsigned int main_clock)
 	if (at91_is_rm92()) {
 		WR4(sc, PMC_SCDR, PMC_SCER_UHP | PMC_SCER_UDP);
 		WR4(sc, PMC_SCER, PMC_SCER_MCKUDP);
-	} else {
+	} else
 		WR4(sc, PMC_SCDR, PMC_SCER_UHP_SAM9 | PMC_SCER_UDP_SAM9);
-	}
 	WR4(sc, CKGR_PLLBR, 0);
 
 	/*
@@ -443,15 +442,14 @@ at91_pmc_init_clock(struct at91_pmc_softc *sc, unsigned int main_clock)
 	mck.parent = clock_list[mckr & 0x3];
 	mck.parent->refcnt++;
 
-	cpu.hz = 
-	mck.hz = mck.parent->hz /
-  	     (1 << ((mckr & PMC_MCKR_PRES_MASK) >> 2));
+	cpu.hz = mck.hz = mck.parent->hz /
+	    (1 << ((mckr & PMC_MCKR_PRES_MASK) >> 2));
 
 	mdiv = (mckr & PMC_MCKR_MDIV_MASK) >> 8;
 	if (at91_is_sam9()) {
 		if (mdiv > 0)
 			mck.hz /= mdiv * 2;
-	} else 
+	} else
 		mck.hz /= (1 + mdiv);
 
 	/* Only found on SAM9G20 */
@@ -574,7 +572,7 @@ at91_pmc_attach(device_t dev)
 static device_method_t at91_pmc_methods[] = {
 	DEVMETHOD(device_probe, at91_pmc_probe),
 	DEVMETHOD(device_attach, at91_pmc_attach),
-	{0, 0},
+	DEVMETHOD_END
 };
 
 static driver_t at91_pmc_driver = {
@@ -584,4 +582,5 @@ static driver_t at91_pmc_driver = {
 };
 static devclass_t at91_pmc_devclass;
 
-DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, 0, 0);
+DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, NULL,
+    NULL);