Commit 3e4282e4 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Scott Wood
Browse files

powerpc/85xx: remove mostly pointless mpc85xx_qe_init() 



Since commit 302c059f (QE: use subsys_initcall to init qe),
mpc85xx_qe_init() has done nothing apart from possibly emitting a
pr_err(). As part of reducing the amount of QE-related code in
arch/powerpc/ (and eventually support QE on other architectures),
remove this low-hanging fruit.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent ea67a551

arch/powerpc/platforms/85xx/common.c

+0 −23
Original line number Diff line number Diff line
@@ -86,29 +86,6 @@ void __init mpc85xx_cpm2_pic_init(void) 
#endif



#ifdef CONFIG_QUICC_ENGINE

void __init mpc85xx_qe_init(void)

{

	struct device_node *np;



	np = of_find_compatible_node(NULL, NULL, "fsl,qe");

	if (!np) {

		np = of_find_node_by_name(NULL, "qe");

		if (!np) {

			pr_err("%s: Could not find Quicc Engine node\n",

					__func__);

			return;

		}

	}



	if (!of_device_is_available(np)) {

		of_node_put(np);

		return;

	}



	of_node_put(np);



}



void __init mpc85xx_qe_par_io_init(void)

{

	struct device_node *np;

arch/powerpc/platforms/85xx/corenet_generic.c

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ void __init corenet_gen_setup_arch(void) 
	swiotlb_detect_4g();



	pr_info("%s board\n", ppc_md.name);



	mpc85xx_qe_init();

}



static const struct of_device_id of_device_ids[] = {

arch/powerpc/platforms/85xx/mpc85xx.h

+0 −2
Original line number Diff line number Diff line
@@ -10,10 +10,8 @@ static inline void __init mpc85xx_cpm2_pic_init(void) {} 
#endif /* CONFIG_CPM2 */



#ifdef CONFIG_QUICC_ENGINE

extern void mpc85xx_qe_init(void);

extern void mpc85xx_qe_par_io_init(void);

#else

static inline void __init mpc85xx_qe_init(void) {}

static inline void __init mpc85xx_qe_par_io_init(void) {}

#endif

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static void __init mpc85xx_mds_qe_init(void) 
{

	struct device_node *np;



	mpc85xx_qe_init();

	mpc85xx_qe_par_io_init();

	mpc85xx_mds_reset_ucc_phys();

arch/powerpc/platforms/85xx/mpc85xx_rdb.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static void __init mpc85xx_rdb_setup_arch(void) 
	fsl_pci_assign_primary();



#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)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE