From 620e112cfe1c9281c176de8ad1a7691c4eb4950d Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 1 Oct 2010 10:54:00 +0200 Subject: ACPI/PNP: A HID value of an object never changes -> make it const Signed-off-by: Thomas Renninger Signed-off-by: Len Brown --- drivers/acpi/button.c | 4 ++-- drivers/acpi/scan.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/acpi') diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 1575a9b..71ef9cd 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -338,7 +338,8 @@ static int acpi_button_add(struct acpi_device *device) { struct acpi_button *button; struct input_dev *input; - char *hid, *name, *class; + const char *hid = acpi_device_hid(device); + char *name, *class; int error; button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL); @@ -353,7 +354,6 @@ static int acpi_button_add(struct acpi_device *device) goto err_free_button; } - hid = acpi_device_hid(device); name = acpi_device_name(device); class = acpi_device_class(device); diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 81aec8d..6155eeb 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -26,8 +26,7 @@ extern struct acpi_device *acpi_root; #define ACPI_IS_ROOT_DEVICE(device) (!(device)->parent) -/* Should be const */ -static char* dummy_hid = "device"; +static const char *dummy_hid = "device"; static LIST_HEAD(acpi_device_list); static LIST_HEAD(acpi_bus_id_list); @@ -1021,7 +1020,7 @@ static int acpi_dock_match(struct acpi_device *device) return acpi_get_handle(device->handle, "_DCK", &tmp); } -char *acpi_device_hid(struct acpi_device *device) +const char *acpi_device_hid(struct acpi_device *device) { struct acpi_hardware_id *hid; -- cgit v1.1