diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
commit | 64576e439709738c0f55ab60cdba0ad18d5aa24e (patch) | |
tree | 031394615b00dacbcec5c9e4b99f4494992ce375 /arch/arm/mach-msm/board-trout.c | |
parent | 3d7e0207ced354d1647195f53bcc670f9756c649 (diff) | |
parent | c0f8a48723d1e7ec48f65c72f880bc49edea9a4a (diff) | |
download | linux-64576e439709738c0f55ab60cdba0ad18d5aa24e.tar.bz2 |
Merge branch 'qcom/drivers' into next/drivers
* qcom/drivers:
tty: serial: Limit msm_serial_hs driver to platforms that use it
mmc: msm_sdcc: Limit driver to platforms that use it
usb: phy: msm: Move mach dependent code to platform data
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-msm/board-trout.c')
-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 ccf6621bc664..015d544aa017 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 = { |