summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-09-09 23:59:42 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-15 02:57:55 +0200
commit844142c3f80c66fb2c311b118d60abdfe02322cb (patch)
tree2fb2d14216f2021db2128cd81ce9796867977926 /drivers/pnp
parent636c19d38920caee61d694ef306d110d33935038 (diff)
downloadlinux-stable-844142c3f80c66fb2c311b118d60abdfe02322cb.tar.gz
linux-stable-844142c3f80c66fb2c311b118d60abdfe02322cb.tar.bz2
linux-stable-844142c3f80c66fb2c311b118d60abdfe02322cb.zip
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.c4
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 = {
};
EXPORT_SYMBOL(pnpacpi_protocol);
-static char *__init pnpacpi_get_id(struct acpi_device *device)
+static const char *__init pnpacpi_get_id(struct acpi_device *device)
{
struct acpi_hardware_id *id;
@@ -222,7 +222,7 @@ static char *__init pnpacpi_get_id(struct acpi_device *device)
static int __init pnpacpi_add_device(struct acpi_device *device)
{
struct pnp_dev *dev;
- char *pnpid;
+ const char *pnpid;
struct acpi_hardware_id *id;
int error;