aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-10-04 08:24:58 -0400
committerMichal Simek <monstr@monstr.eu>2012-10-04 09:00:32 -0400
commitaaa5241ebb53733663775c8a044004d63a126eb6 (patch)
tree814379adaae5d61926c2e303f6dbed0c464cd75c /arch/microblaze
parentfcc1c0ff2506cab8c3a019374550f68b3cbadcbe (diff)
microblaze: Prefer to use pr_XXX instead of printk(KERN_XX)
Fix reset.c, timer.c, setup.c file. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/reset.c14
-rw-r--r--arch/microblaze/kernel/setup.c2
-rw-r--r--arch/microblaze/kernel/timer.c14
3 files changed, 15 insertions, 15 deletions
diff --git a/arch/microblaze/kernel/reset.c b/arch/microblaze/kernel/reset.c
index 6ce60fb24ac5..2e5079ab53d2 100644
--- a/arch/microblaze/kernel/reset.c
+++ b/arch/microblaze/kernel/reset.c
@@ -26,14 +26,14 @@ void of_platform_reset_gpio_probe(void)
26 "hard-reset-gpios", 0); 26 "hard-reset-gpios", 0);
27 27
28 if (!gpio_is_valid(handle)) { 28 if (!gpio_is_valid(handle)) {
29 printk(KERN_INFO "Skipping unavailable RESET gpio %d (%s)\n", 29 pr_info("Skipping unavailable RESET gpio %d (%s)\n",
30 handle, "reset"); 30 handle, "reset");
31 return; 31 return;
32 } 32 }
33 33
34 ret = gpio_request(handle, "reset"); 34 ret = gpio_request(handle, "reset");
35 if (ret < 0) { 35 if (ret < 0) {
36 printk(KERN_INFO "GPIO pin is already allocated\n"); 36 pr_info("GPIO pin is already allocated\n");
37 return; 37 return;
38 } 38 }
39 39
@@ -50,7 +50,7 @@ void of_platform_reset_gpio_probe(void)
50 /* Setup output direction */ 50 /* Setup output direction */
51 gpio_set_value(handle, 0); 51 gpio_set_value(handle, 0);
52 52
53 printk(KERN_INFO "RESET: Registered gpio device: %d, current val: %d\n", 53 pr_info("RESET: Registered gpio device: %d, current val: %d\n",
54 handle, reset_val); 54 handle, reset_val);
55 return; 55 return;
56err: 56err:
@@ -76,7 +76,7 @@ void of_platform_reset_gpio_probe(void)
76 76
77void machine_restart(char *cmd) 77void machine_restart(char *cmd)
78{ 78{
79 printk(KERN_NOTICE "Machine restart...\n"); 79 pr_notice("Machine restart...\n");
80 gpio_system_reset(); 80 gpio_system_reset();
81 while (1) 81 while (1)
82 ; 82 ;
@@ -84,21 +84,21 @@ void machine_restart(char *cmd)
84 84
85void machine_shutdown(void) 85void machine_shutdown(void)
86{ 86{
87 printk(KERN_NOTICE "Machine shutdown...\n"); 87 pr_notice("Machine shutdown...\n");
88 while (1) 88 while (1)
89 ; 89 ;
90} 90}
91 91
92void machine_halt(void) 92void machine_halt(void)
93{ 93{
94 printk(KERN_NOTICE "Machine halt...\n"); 94 pr_notice("Machine halt...\n");
95 while (1) 95 while (1)
96 ; 96 ;
97} 97}
98 98
99void machine_power_off(void) 99void machine_power_off(void)
100{ 100{
101 printk(KERN_NOTICE "Machine power off...\n"); 101 pr_notice("Machine power off...\n");
102 while (1) 102 while (1)
103 ; 103 ;
104} 104}
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 9dbc9ecb28f1..954348f83505 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -69,7 +69,7 @@ void __init setup_arch(char **cmdline_p)
69 xilinx_pci_init(); 69 xilinx_pci_init();
70 70
71#if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER) 71#if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER)
72 printk(KERN_NOTICE "Self modified code enable\n"); 72 pr_notice("Self modified code enable\n");
73#endif 73#endif
74 74
75#ifdef CONFIG_VT 75#ifdef CONFIG_VT
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index edd3f835e7df..aec5020a6e31 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -116,21 +116,21 @@ static void microblaze_timer_set_mode(enum clock_event_mode mode,
116{ 116{
117 switch (mode) { 117 switch (mode) {
118 case CLOCK_EVT_MODE_PERIODIC: 118 case CLOCK_EVT_MODE_PERIODIC:
119 printk(KERN_INFO "%s: periodic\n", __func__); 119 pr_info("%s: periodic\n", __func__);
120 microblaze_timer0_start_periodic(freq_div_hz); 120 microblaze_timer0_start_periodic(freq_div_hz);
121 break; 121 break;
122 case CLOCK_EVT_MODE_ONESHOT: 122 case CLOCK_EVT_MODE_ONESHOT:
123 printk(KERN_INFO "%s: oneshot\n", __func__); 123 pr_info("%s: oneshot\n", __func__);
124 break; 124 break;
125 case CLOCK_EVT_MODE_UNUSED: 125 case CLOCK_EVT_MODE_UNUSED:
126 printk(KERN_INFO "%s: unused\n", __func__); 126 pr_info("%s: unused\n", __func__);
127 break; 127 break;
128 case CLOCK_EVT_MODE_SHUTDOWN: 128 case CLOCK_EVT_MODE_SHUTDOWN:
129 printk(KERN_INFO "%s: shutdown\n", __func__); 129 pr_info("%s: shutdown\n", __func__);
130 microblaze_timer0_stop(); 130 microblaze_timer0_stop();
131 break; 131 break;
132 case CLOCK_EVT_MODE_RESUME: 132 case CLOCK_EVT_MODE_RESUME:
133 printk(KERN_INFO "%s: resume\n", __func__); 133 pr_info("%s: resume\n", __func__);
134 break; 134 break;
135 } 135 }
136} 136}
@@ -274,14 +274,14 @@ void __init time_init(void)
274 timer_num = be32_to_cpup(of_get_property(timer, 274 timer_num = be32_to_cpup(of_get_property(timer,
275 "xlnx,one-timer-only", NULL)); 275 "xlnx,one-timer-only", NULL));
276 if (timer_num) { 276 if (timer_num) {
277 printk(KERN_EMERG "Please enable two timers in HW\n"); 277 pr_emerg("Please enable two timers in HW\n");
278 BUG(); 278 BUG();
279 } 279 }
280 280
281#ifdef CONFIG_SELFMOD_TIMER 281#ifdef CONFIG_SELFMOD_TIMER
282 selfmod_function((int *) arr_func, timer_baseaddr); 282 selfmod_function((int *) arr_func, timer_baseaddr);
283#endif 283#endif
284 printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n", 284 pr_info("%s #0 at 0x%08x, irq=%d\n",
285 timer->name, timer_baseaddr, irq); 285 timer->name, timer_baseaddr, irq);
286 286
287 /* If there is clock-frequency property than use it */ 287 /* If there is clock-frequency property than use it */