aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/gpmc-smsc911x.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2011-04-26 12:25:56 -0400
committerTony Lindgren <tony@atomide.com>2011-05-03 03:38:58 -0400
commit11383a9bcc213cd2b55e2aef863ef2a8b3d7b62c (patch)
treeda738e296db096fb2c133ee69f0b4a68351d7e2d /arch/arm/mach-omap2/gpmc-smsc911x.c
parent21b42731e6ab1ccbbe9ad1b639c5d78eecad8432 (diff)
arm: omap: gpmc-smsc911x: minor style fixes
replace "printk(KERN_ERR" by "pr_err(" and fix needlessly multi-lined #ifdef Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/gpmc-smsc911x.c')
-rw-r--r--arch/arm/mach-omap2/gpmc-smsc911x.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index d30293a36494..e09374a48dd8 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -10,6 +10,7 @@
10 * it under the terms of the GNU General Public License version 2 as 10 * it under the terms of the GNU General Public License version 2 as
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12 */ 12 */
13#define pr_fmt(fmt) "%s: " fmt, __func__
13 14
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/platform_device.h> 16#include <linux/platform_device.h>
@@ -55,7 +56,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
55 gpmc_cfg = board_data; 56 gpmc_cfg = board_data;
56 57
57 if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) { 58 if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {
58 printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n"); 59 pr_err("Failed to request GPMC mem region\n");
59 return; 60 return;
60 } 61 }
61 62
@@ -63,8 +64,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
63 gpmc_smsc911x_resources[0].end = cs_mem_base + 0xff; 64 gpmc_smsc911x_resources[0].end = cs_mem_base + 0xff;
64 65
65 if (gpio_request(gpmc_cfg->gpio_irq, "smsc911x irq") < 0) { 66 if (gpio_request(gpmc_cfg->gpio_irq, "smsc911x irq") < 0) {
66 printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n", 67 pr_err("Failed to request IRQ GPIO%d\n", gpmc_cfg->gpio_irq);
67 gpmc_cfg->gpio_irq);
68 goto free1; 68 goto free1;
69 } 69 }
70 70
@@ -74,8 +74,8 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
74 if (gpio_is_valid(gpmc_cfg->gpio_reset)) { 74 if (gpio_is_valid(gpmc_cfg->gpio_reset)) {
75 ret = gpio_request(gpmc_cfg->gpio_reset, "smsc911x reset"); 75 ret = gpio_request(gpmc_cfg->gpio_reset, "smsc911x reset");
76 if (ret) { 76 if (ret) {
77 printk(KERN_ERR "Failed to request GPIO%d for smsc911x reset\n", 77 pr_err("Failed to request reset GPIO%d\n",
78 gpmc_cfg->gpio_reset); 78 gpmc_cfg->gpio_reset);
79 goto free2; 79 goto free2;
80 } 80 }
81 81
@@ -92,7 +92,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
92 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources), 92 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),
93 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config)); 93 &gpmc_smsc911x_config, sizeof(gpmc_smsc911x_config));
94 if (!pdev) { 94 if (!pdev) {
95 printk(KERN_ERR "Unable to register smsc911x device\n"); 95 pr_err("Unable to register platform device\n");
96 gpio_free(gpmc_cfg->gpio_reset); 96 gpio_free(gpmc_cfg->gpio_reset);
97 goto free2; 97 goto free2;
98 } 98 }
@@ -104,5 +104,5 @@ free2:
104free1: 104free1:
105 gpmc_cs_free(gpmc_cfg->cs); 105 gpmc_cs_free(gpmc_cfg->cs);
106 106
107 printk(KERN_ERR "Could not initialize smsc911x\n"); 107 pr_err("Could not initialize smsc911x device\n");
108} 108}