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>
This commit is contained in:
parent
636c19d389
commit
844142c3f8
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue