[PATCH 03/25] drivers/acpi: Use static const char arrays

From: Joe Perches
Date: Mon Sep 13 2010 - 15:52:35 EST


Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/acpi/sleep.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index cf82989..566b1cdd 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -567,7 +567,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
{
acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
struct acpi_device *adev;
- char acpi_method[] = "_SxD";
+ char acpi_method[sizeof("_SxD")];
unsigned long long d_min, d_max;

if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
@@ -575,7 +575,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
return -ENODEV;
}

- acpi_method[2] = '0' + acpi_target_sleep_state;
+ sprintf(acpi_method, "_S%cD", '0' + acpi_target_sleep_state);
/*
* If the sleep state is S0, we will return D3, but if the device has
* _S0W, we will use the value from _S0W
--
1.7.3.rc1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/