diff options
author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-07-17 00:41:41 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-08-05 01:41:34 -0400 |
commit | 0dae27439acc75266d35c39970f1b5d80e0c596b (patch) | |
tree | b48e9630a866e6ad7d92ae201889f04badb00a67 /arch/powerpc/platforms/pseries | |
parent | 0ed352dddbfc1886dffa8b84e4b5ce4e6f6c2512 (diff) |
powerpc/eeh: Replace pr_warning() with pr_warn()
pr_warn() is equal to pr_warning(), but the former is a bit more
formal according to commit fc62f2f ("kernel.h: add pr_warn for
symmetry to dev_warn, netdev_warn").
The patch replaces pr_warning() with pr_warn().
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh_pseries.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c index dd1874ca56d9..b08053819d99 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c | |||
@@ -89,26 +89,26 @@ static int pseries_eeh_init(void) | |||
89 | * of domain/bus/slot/function for EEH RTAS operations. | 89 | * of domain/bus/slot/function for EEH RTAS operations. |
90 | */ | 90 | */ |
91 | if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE) { | 91 | if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE) { |
92 | pr_warning("%s: RTAS service <ibm,set-eeh-option> invalid\n", | 92 | pr_warn("%s: RTAS service <ibm,set-eeh-option> invalid\n", |
93 | __func__); | 93 | __func__); |
94 | return -EINVAL; | 94 | return -EINVAL; |
95 | } else if (ibm_set_slot_reset == RTAS_UNKNOWN_SERVICE) { | 95 | } else if (ibm_set_slot_reset == RTAS_UNKNOWN_SERVICE) { |
96 | pr_warning("%s: RTAS service <ibm,set-slot-reset> invalid\n", | 96 | pr_warn("%s: RTAS service <ibm,set-slot-reset> invalid\n", |
97 | __func__); | 97 | __func__); |
98 | return -EINVAL; | 98 | return -EINVAL; |
99 | } else if (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE && | 99 | } else if (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE && |
100 | ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) { | 100 | ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) { |
101 | pr_warning("%s: RTAS service <ibm,read-slot-reset-state2> and " | 101 | pr_warn("%s: RTAS service <ibm,read-slot-reset-state2> and " |
102 | "<ibm,read-slot-reset-state> invalid\n", | 102 | "<ibm,read-slot-reset-state> invalid\n", |
103 | __func__); | 103 | __func__); |
104 | return -EINVAL; | 104 | return -EINVAL; |
105 | } else if (ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE) { | 105 | } else if (ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE) { |
106 | pr_warning("%s: RTAS service <ibm,slot-error-detail> invalid\n", | 106 | pr_warn("%s: RTAS service <ibm,slot-error-detail> invalid\n", |
107 | __func__); | 107 | __func__); |
108 | return -EINVAL; | 108 | return -EINVAL; |
109 | } else if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE && | 109 | } else if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE && |
110 | ibm_configure_bridge == RTAS_UNKNOWN_SERVICE) { | 110 | ibm_configure_bridge == RTAS_UNKNOWN_SERVICE) { |
111 | pr_warning("%s: RTAS service <ibm,configure-pe> and " | 111 | pr_warn("%s: RTAS service <ibm,configure-pe> and " |
112 | "<ibm,configure-bridge> invalid\n", | 112 | "<ibm,configure-bridge> invalid\n", |
113 | __func__); | 113 | __func__); |
114 | return -EINVAL; | 114 | return -EINVAL; |
@@ -118,11 +118,11 @@ static int pseries_eeh_init(void) | |||
118 | spin_lock_init(&slot_errbuf_lock); | 118 | spin_lock_init(&slot_errbuf_lock); |
119 | eeh_error_buf_size = rtas_token("rtas-error-log-max"); | 119 | eeh_error_buf_size = rtas_token("rtas-error-log-max"); |
120 | if (eeh_error_buf_size == RTAS_UNKNOWN_SERVICE) { | 120 | if (eeh_error_buf_size == RTAS_UNKNOWN_SERVICE) { |
121 | pr_warning("%s: unknown EEH error log size\n", | 121 | pr_warn("%s: unknown EEH error log size\n", |
122 | __func__); | 122 | __func__); |
123 | eeh_error_buf_size = 1024; | 123 | eeh_error_buf_size = 1024; |
124 | } else if (eeh_error_buf_size > RTAS_ERROR_LOG_MAX) { | 124 | } else if (eeh_error_buf_size > RTAS_ERROR_LOG_MAX) { |
125 | pr_warning("%s: EEH error log size %d exceeds the maximal %d\n", | 125 | pr_warn("%s: EEH error log size %d exceeds the maximal %d\n", |
126 | __func__, eeh_error_buf_size, RTAS_ERROR_LOG_MAX); | 126 | __func__, eeh_error_buf_size, RTAS_ERROR_LOG_MAX); |
127 | eeh_error_buf_size = RTAS_ERROR_LOG_MAX; | 127 | eeh_error_buf_size = RTAS_ERROR_LOG_MAX; |
128 | } | 128 | } |
@@ -270,7 +270,7 @@ static void *pseries_eeh_of_probe(struct device_node *dn, void *flag) | |||
270 | /* Retrieve the device address */ | 270 | /* Retrieve the device address */ |
271 | regs = of_get_property(dn, "reg", NULL); | 271 | regs = of_get_property(dn, "reg", NULL); |
272 | if (!regs) { | 272 | if (!regs) { |
273 | pr_warning("%s: OF node property %s::reg not found\n", | 273 | pr_warn("%s: OF node property %s::reg not found\n", |
274 | __func__, dn->full_name); | 274 | __func__, dn->full_name); |
275 | return NULL; | 275 | return NULL; |
276 | } | 276 | } |
@@ -398,7 +398,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe) | |||
398 | pe->config_addr, BUID_HI(pe->phb->buid), | 398 | pe->config_addr, BUID_HI(pe->phb->buid), |
399 | BUID_LO(pe->phb->buid), 0); | 399 | BUID_LO(pe->phb->buid), 0); |
400 | if (ret) { | 400 | if (ret) { |
401 | pr_warning("%s: Failed to get address for PHB#%d-PE#%x\n", | 401 | pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n", |
402 | __func__, pe->phb->global_number, pe->config_addr); | 402 | __func__, pe->phb->global_number, pe->config_addr); |
403 | return 0; | 403 | return 0; |
404 | } | 404 | } |
@@ -411,7 +411,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe) | |||
411 | pe->config_addr, BUID_HI(pe->phb->buid), | 411 | pe->config_addr, BUID_HI(pe->phb->buid), |
412 | BUID_LO(pe->phb->buid), 0); | 412 | BUID_LO(pe->phb->buid), 0); |
413 | if (ret) { | 413 | if (ret) { |
414 | pr_warning("%s: Failed to get address for PHB#%d-PE#%x\n", | 414 | pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n", |
415 | __func__, pe->phb->global_number, pe->config_addr); | 415 | __func__, pe->phb->global_number, pe->config_addr); |
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
@@ -584,17 +584,17 @@ static int pseries_eeh_wait_state(struct eeh_pe *pe, int max_wait) | |||
584 | return ret; | 584 | return ret; |
585 | 585 | ||
586 | if (max_wait <= 0) { | 586 | if (max_wait <= 0) { |
587 | pr_warning("%s: Timeout when getting PE's state (%d)\n", | 587 | pr_warn("%s: Timeout when getting PE's state (%d)\n", |
588 | __func__, max_wait); | 588 | __func__, max_wait); |
589 | return EEH_STATE_NOT_SUPPORT; | 589 | return EEH_STATE_NOT_SUPPORT; |
590 | } | 590 | } |
591 | 591 | ||
592 | if (mwait <= 0) { | 592 | if (mwait <= 0) { |
593 | pr_warning("%s: Firmware returned bad wait value %d\n", | 593 | pr_warn("%s: Firmware returned bad wait value %d\n", |
594 | __func__, mwait); | 594 | __func__, mwait); |
595 | mwait = EEH_STATE_MIN_WAIT_TIME; | 595 | mwait = EEH_STATE_MIN_WAIT_TIME; |
596 | } else if (mwait > EEH_STATE_MAX_WAIT_TIME) { | 596 | } else if (mwait > EEH_STATE_MAX_WAIT_TIME) { |
597 | pr_warning("%s: Firmware returned too long wait value %d\n", | 597 | pr_warn("%s: Firmware returned too long wait value %d\n", |
598 | __func__, mwait); | 598 | __func__, mwait); |
599 | mwait = EEH_STATE_MAX_WAIT_TIME; | 599 | mwait = EEH_STATE_MAX_WAIT_TIME; |
600 | } | 600 | } |
@@ -675,7 +675,7 @@ static int pseries_eeh_configure_bridge(struct eeh_pe *pe) | |||
675 | } | 675 | } |
676 | 676 | ||
677 | if (ret) | 677 | if (ret) |
678 | pr_warning("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n", | 678 | pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n", |
679 | __func__, pe->phb->global_number, pe->addr, ret); | 679 | __func__, pe->phb->global_number, pe->addr, ret); |
680 | 680 | ||
681 | return ret; | 681 | return ret; |