diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 10:23:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 10:23:24 -0800 |
| commit | 55e0b071892c9112ab49496e924f7310843afb67 (patch) | |
| tree | ee778e15ea3a4c214b261b25a7e22845d63cce19 | |
| parent | f89bc02fe535b6f14b741df2eb268ce8eb716c31 (diff) | |
| parent | c4b4ecbda50379b587ccff81663f3235582e5c66 (diff) | |
Merge branch 'qcom/fixes' into next/fixes-non-critical
* qcom/fixes:
ARM: msm: trout: fix uninit var warning
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-msm/board-trout.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index ccf6621bc66..015d544aa01 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. * */ +#define pr_fmt(fmt) "%s: " fmt, __func__ #include <linux/kernel.h> #include <linux/init.h> @@ -68,12 +69,11 @@ static void __init trout_init(void) platform_add_devices(devices, ARRAY_SIZE(devices)); -#ifdef CONFIG_MMC - rc = trout_init_mmc(system_rev); - if (rc) - printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc); -#endif - + if (IS_ENABLED(CONFIG_MMC)) { + rc = trout_init_mmc(system_rev); + if (rc) + pr_crit("MMC init failure (%d)\n", rc); + } } static struct map_desc trout_io_desc[] __initdata = { |