diff options
author | Len Brown <len.brown@intel.com> | 2006-06-26 23:04:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:00:54 -0400 |
commit | cece92969762b8ed7930d4e23008b76b06411dee (patch) | |
tree | ab3d84b71971f0405ab2b1b36d9fdd39b0bda55e /drivers/acpi/utils.c | |
parent | 64dedfb8fdbbc4fabb8c131e4b597cd4bc7f3881 (diff) |
ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/utils.c')
-rw-r--r-- | drivers/acpi/utils.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index ce093d4516ba..040ff473d1f2 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
@@ -62,25 +62,25 @@ acpi_extract_package(union acpi_object *package, | |||
62 | 62 | ||
63 | if (!package || (package->type != ACPI_TYPE_PACKAGE) | 63 | if (!package || (package->type != ACPI_TYPE_PACKAGE) |
64 | || (package->package.count < 1)) { | 64 | || (package->package.count < 1)) { |
65 | ACPI_WARNING((AE_INFO, "Invalid package argument")); | 65 | printk(KERN_WARNING PREFIX "Invalid package argument\n"); |
66 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 66 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
67 | } | 67 | } |
68 | 68 | ||
69 | if (!format || !format->pointer || (format->length < 1)) { | 69 | if (!format || !format->pointer || (format->length < 1)) { |
70 | ACPI_WARNING((AE_INFO, "Invalid format argument")); | 70 | printk(KERN_WARNING PREFIX "Invalid format argument\n"); |
71 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 71 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
72 | } | 72 | } |
73 | 73 | ||
74 | if (!buffer) { | 74 | if (!buffer) { |
75 | ACPI_WARNING((AE_INFO, "Invalid buffer argument")); | 75 | printk(KERN_WARNING PREFIX "Invalid buffer argument\n"); |
76 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 76 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
77 | } | 77 | } |
78 | 78 | ||
79 | format_count = (format->length / sizeof(char)) - 1; | 79 | format_count = (format->length / sizeof(char)) - 1; |
80 | if (format_count > package->package.count) { | 80 | if (format_count > package->package.count) { |
81 | ACPI_WARNING((AE_INFO, "Format specifies more objects [%d]" | 81 | printk(KERN_WARNING PREFIX "Format specifies more objects [%d]" |
82 | " than exist in package [%d].", | 82 | " than exist in package [%d].\n", |
83 | format_count, package->package.count)); | 83 | format_count, package->package.count); |
84 | return_ACPI_STATUS(AE_BAD_DATA); | 84 | return_ACPI_STATUS(AE_BAD_DATA); |
85 | } | 85 | } |
86 | 86 | ||
@@ -112,10 +112,10 @@ acpi_extract_package(union acpi_object *package, | |||
112 | tail_offset += sizeof(char *); | 112 | tail_offset += sizeof(char *); |
113 | break; | 113 | break; |
114 | default: | 114 | default: |
115 | ACPI_WARNING((AE_INFO, "Invalid package element" | 115 | printk(KERN_WARNING PREFIX "Invalid package element" |
116 | " [%d]: got number, expecing" | 116 | " [%d]: got number, expecing" |
117 | " [%c]", | 117 | " [%c]\n", |
118 | i, format_string[i])); | 118 | i, format_string[i]); |
119 | return_ACPI_STATUS(AE_BAD_DATA); | 119 | return_ACPI_STATUS(AE_BAD_DATA); |
120 | break; | 120 | break; |
121 | } | 121 | } |
@@ -138,10 +138,10 @@ acpi_extract_package(union acpi_object *package, | |||
138 | tail_offset += sizeof(u8 *); | 138 | tail_offset += sizeof(u8 *); |
139 | break; | 139 | break; |
140 | default: | 140 | default: |
141 | ACPI_WARNING((AE_INFO, "Invalid package element" | 141 | printk(KERN_WARNING PREFIX "Invalid package element" |
142 | " [%d] got string/buffer," | 142 | " [%d] got string/buffer," |
143 | " expecing [%c]", | 143 | " expecing [%c]\n", |
144 | i, format_string[i])); | 144 | i, format_string[i]); |
145 | return_ACPI_STATUS(AE_BAD_DATA); | 145 | return_ACPI_STATUS(AE_BAD_DATA); |
146 | break; | 146 | break; |
147 | } | 147 | } |