Commit 321cfc85 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap3: Clean-up for omap_mux_init 



Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b702b106

arch/arm/mach-omap2/mux.c

+34 −12
Original line number Diff line number Diff line
@@ -985,6 +985,38 @@ static void __init omap_mux_init_list(struct omap_mux *superset) 
	}

}



#ifdef CONFIG_OMAP_MUX



static void omap_mux_init_package(struct omap_mux *superset,

				  struct omap_mux *package_subset,

				  struct omap_ball *package_balls)

{

	if (package_subset)

		omap_mux_package_fixup(package_subset, superset);

	if (package_balls)

		omap_mux_package_init_balls(package_balls, superset);

}



static void omap_mux_init_signals(struct omap_board_mux *board_mux)

{

	omap_mux_set_cmdline_signals();

	omap_mux_write_array(board_mux);

}



#else



static void omap_mux_init_package(struct omap_mux *superset,

				  struct omap_mux *package_subset,

				  struct omap_ball *package_balls)

{

}



static void omap_mux_init_signals(struct omap_board_mux *board_mux)

{

}



#endif



int __init omap_mux_init(u32 mux_pbase, u32 mux_size,

				struct omap_mux *superset,

				struct omap_mux *package_subset,
@@ -1001,19 +1033,9 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size, 
		return -ENODEV;

	}



#ifdef CONFIG_OMAP_MUX

	if (package_subset)

		omap_mux_package_fixup(package_subset, superset);

	if (package_balls)

		omap_mux_package_init_balls(package_balls, superset);

#endif



	omap_mux_init_package(superset, package_subset, package_balls);

	omap_mux_init_list(superset);



#ifdef CONFIG_OMAP_MUX

	omap_mux_set_cmdline_signals();

	omap_mux_write_array(board_mux);

#endif

	omap_mux_init_signals(board_mux);



	return 0;

}