From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/19] omap3: Clean-up for omap_mux_init
Date: Thu, 11 Feb 2010 16:51:33 -0800 [thread overview]
Message-ID: <20100212005133.24958.45495.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100212004844.24958.29506.stgit@baageli.muru.com>
Get rid of the ifdeffery in omap_mux_init by creating
omap_mux_init_package and omap_mux_init_signals functions.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/mux.c | 46 +++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 5ee2372..986077f 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -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;
}
next prev parent reply other threads:[~2010-02-12 0:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 0:51 [PATCH 00/19] omap updates for 2.6.34 merge window, part 2 Tony Lindgren
2010-02-12 0:51 ` [PATCH 01/19] omap_hsmmc: Move gpio and regulator control from board file Tony Lindgren
2010-02-12 0:51 ` [PATCH 02/19] omap: Rename mmc-twl4030 files to hsmmc Tony Lindgren
2010-02-12 0:51 ` [PATCH 03/19] omap: Rename hsmmc symbols to reflect independence from twl4030 Tony Lindgren
2010-02-12 0:51 ` [PATCH 04/19] omap: Reconnect hsmmc context loss count Tony Lindgren
2010-02-12 0:51 ` [PATCH 05/19] omap: RX51: Remux to pull eMMC lines down when powering off Tony Lindgren
2010-02-12 0:51 ` [PATCH 06/19] omap_hsmmc: Allow for power saving without going off Tony Lindgren
2010-02-12 0:51 ` [PATCH 07/19] omap_hsmmc: Fix disable timeouts Tony Lindgren
2010-02-12 0:51 ` [PATCH 08/19] omap_hsmmc: Ensure regulator enable / disable are paired Tony Lindgren
2010-02-12 0:51 ` [PATCH 09/19] omap_hsmmc: Allow for a shared VccQ Tony Lindgren
2010-02-12 0:51 ` [PATCH 10/19] omap_hsmmc: allow compile without regulator framework Tony Lindgren
2010-02-12 0:51 ` Tony Lindgren [this message]
2010-02-12 0:51 ` [PATCH 12/19] omap3: pm: Add T2 Keypad as a wakeup source Tony Lindgren
2010-02-12 0:51 ` [PATCH 13/19] AM35xx: Introduce am35xx.h file Tony Lindgren
2010-02-12 0:51 ` [PATCH 14/19] AM35xx: Add AM35xx intr_clr & sw_rst cntrl reg bit definition Tony Lindgren
2010-02-12 0:51 ` [PATCH 15/19] AM35xx: Update irq.h for AM35xx IPSS module interrupts Tony Lindgren
2010-02-12 0:51 ` [PATCH 16/19] arm: omap: kill compile warning on board-4430-sdp.c Tony Lindgren
2010-02-12 0:51 ` [PATCH 17/19] OMAP4: IRQ: Add McPDM IRQ definition Tony Lindgren
2010-02-12 0:51 ` [PATCH 18/19] ARM: OMAP4: Add McPDM base address Tony Lindgren
2010-02-12 0:51 ` [PATCH 19/19] OMAP4: MCPDM: Register McPDM platform device Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100212005133.24958.45495.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).