On Thu, Mar 26, 2015 at 05:16:17PM +0800, ying.zh...@freescale.com wrote:
> @@ -96,37 +102,63 @@ static void __init mpc85xx_rdb_setup_arch(void)
> #ifdef CONFIG_QUICC_ENGINE
> mpc85xx_qe_init();
> mpc85xx_qe_par_io_init();
> -#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE)
> - if (machine_is(p1025_rdb)) {
> - struct device_node *np;
> -
> - struct ccsr_guts __iomem *guts;
> -
> - np = of_find_node_by_name(NULL, "global-utilities");
> - if (np) {
> - guts = of_iomap(np, 0);
> - if (!guts) {
> -
> - pr_err("mpc85xx-rdb: could not map global
> utilities register\n");
> +#ifdef CONFIG_SPI_FSL_SPI
> + for_each_node_by_name(qe_spi, "spi")
> + par_io_of_config(qe_spi);
Why are you assuming that any node named "spi" is a QE SPI?
> +#endif /* CONFIG_SPI_FSL_SPI */
>
> - } else {
> - /* P1025 has pins muxed for QE and other functions. To
> - * enable QE UEC mode, we need to set bit QE0 for UCC1
> - * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9
> - * and QE12 for QE MII management singals in PMUXCR
> - * register.
> - */
> + np = of_find_node_by_name(NULL, "global-utilities");
> + if (np) {
> + guts = of_iomap(np, 0);
> + if (!guts)
> + pr_err("mpc85xx-rdb: could not map global %s\n",
> + "utilities register");
> + else {
Don't put a bunch of code in the else of an error check. Factor this out
to its own function and return early if you don't find what you're
looking for.
-Scott
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
