diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-09-09 17:59:42 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-14 20:57:55 -0400 |
commit | 844142c3f80c66fb2c311b118d60abdfe02322cb (patch) | |
tree | 2fb2d14216f2021db2128cd81ce9796867977926 /drivers/pnp | |
parent | 636c19d38920caee61d694ef306d110d33935038 (diff) |
ACPI / scan: constify struct acpi_hardware_id::id
This is preparation for using kstrdup_const to initialize that member.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/pnpacpi/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 5153d1d69aee..9113876487ed 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
@@ -207,7 +207,7 @@ struct pnp_protocol pnpacpi_protocol = { | |||
207 | }; | 207 | }; |
208 | EXPORT_SYMBOL(pnpacpi_protocol); | 208 | EXPORT_SYMBOL(pnpacpi_protocol); |
209 | 209 | ||
210 | static char *__init pnpacpi_get_id(struct acpi_device *device) | 210 | static const char *__init pnpacpi_get_id(struct acpi_device *device) |
211 | { | 211 | { |
212 | struct acpi_hardware_id *id; | 212 | struct acpi_hardware_id *id; |
213 | 213 | ||
@@ -222,7 +222,7 @@ static char *__init pnpacpi_get_id(struct acpi_device *device) | |||
222 | static int __init pnpacpi_add_device(struct acpi_device *device) | 222 | static int __init pnpacpi_add_device(struct acpi_device *device) |
223 | { | 223 | { |
224 | struct pnp_dev *dev; | 224 | struct pnp_dev *dev; |
225 | char *pnpid; | 225 | const char *pnpid; |
226 | struct acpi_hardware_id *id; | 226 | struct acpi_hardware_id *id; |
227 | int error; | 227 | int error; |
228 | 228 | ||