Commit 844142c3 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Rafael J. Wysocki
Browse files

ACPI / scan: constify struct acpi_hardware_id::id 



This is preparation for using kstrdup_const to initialize that member.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 636c19d3

drivers/acpi/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ bool acpi_device_is_present(struct acpi_device *adev) 
}



static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,

				       char *idstr,

				       const char *idstr,

				       const struct acpi_device_id **matchid)

{

	const struct acpi_device_id *devid;
@@ -1491,7 +1491,7 @@ static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, 
	return false;

}



static struct acpi_scan_handler *acpi_scan_match_handler(char *idstr,

static struct acpi_scan_handler *acpi_scan_match_handler(const char *idstr,

					const struct acpi_device_id **matchid)

{

	struct acpi_scan_handler *handler;

drivers/pnp/pnpacpi/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ typedef char acpi_device_class[20]; 


struct acpi_hardware_id {

	struct list_head list;

	char *id;

	const char *id;

};



struct acpi_pnp_type {