aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/cm-x300.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2011-05-09 07:41:48 -0400
committerEric Miao <eric.y.miao@gmail.com>2011-07-11 02:43:27 -0400
commit32de50e2416bc3da8c5b68f7afc280bcef630c23 (patch)
tree23192b2694b5d14a8229c930a1171d68eb7eaa0f /arch/arm/mach-pxa/cm-x300.c
parent5a009df1f200efa49658b0e9c7ad056d59fbefe4 (diff)
ARM: pxa/cm-x300: minor style cleanup
introduce pr_fmt, so the pr_* calls will be cleaner Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
-rw-r--r--arch/arm/mach-pxa/cm-x300.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 880df335a3e..b199596f9c3 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -12,6 +12,7 @@
12 * it under the terms of the GNU General Public License version 2 as 12 * it under the terms of the GNU General Public License version 2 as
13 * published by the Free Software Foundation. 13 * published by the Free Software Foundation.
14 */ 14 */
15#define pr_fmt(fmt) "%s: " fmt, __func__
15 16
16#include <linux/module.h> 17#include <linux/module.h>
17#include <linux/kernel.h> 18#include <linux/kernel.h>
@@ -487,8 +488,7 @@ static int cm_x300_ulpi_phy_reset(void)
487 err = gpio_request_one(GPIO_ULPI_PHY_RST, GPIOF_OUT_INIT_LOW, 488 err = gpio_request_one(GPIO_ULPI_PHY_RST, GPIOF_OUT_INIT_LOW,
488 "ulpi reset"); 489 "ulpi reset");
489 if (err) { 490 if (err) {
490 pr_err("%s: failed to request ULPI reset GPIO: %d\n", 491 pr_err("failed to request ULPI reset GPIO: %d\n", err);
491 __func__, err);
492 return err; 492 return err;
493 } 493 }
494 494
@@ -510,8 +510,7 @@ static inline int cm_x300_u2d_init(struct device *dev)
510 pout_clk = clk_get(NULL, "CLK_POUT"); 510 pout_clk = clk_get(NULL, "CLK_POUT");
511 if (IS_ERR(pout_clk)) { 511 if (IS_ERR(pout_clk)) {
512 err = PTR_ERR(pout_clk); 512 err = PTR_ERR(pout_clk);
513 pr_err("%s: failed to get CLK_POUT: %d\n", 513 pr_err("failed to get CLK_POUT: %d\n", err);
514 __func__, err);
515 return err; 514 return err;
516 } 515 }
517 clk_enable(pout_clk); 516 clk_enable(pout_clk);
@@ -787,7 +786,7 @@ static void __init cm_x300_init_wi2wi(void)
787 /* Libertas and CSR reset */ 786 /* Libertas and CSR reset */
788 err = gpio_request_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios)); 787 err = gpio_request_array(ARRAY_AND_SIZE(cm_x300_wi2wi_gpios));
789 if (err) { 788 if (err) {
790 pr_err("CM-X300: failed to request wifi/bt gpios: %d\n", err); 789 pr_err("failed to request wifi/bt gpios: %d\n", err);
791 return; 790 return;
792 } 791 }
793 792