torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

Merge branch 'acpi-misc'

Browse Source 
Merge miscellaneous ACPI changes for 6.13-rc1:

 - Switch several ACPI platform drivers back to using struct
   platform_driver::remove() (Uwe Kleine-König).

 - Replace strcpy() with strscpy() in multiple places in the ACPI
   subsystem (Muhammad Qasim Abdul Majeed, Abdul Rahim).

* acpi-misc:
  ACPI: Switch back to struct platform_driver::remove()
  ACPI: scan: Use strscpy() instead of strcpy()
  ACPI: SBSHC: Use strscpy() instead of strcpy()
  ACPI: SBS: Use strscpy() instead of strcpy()
  ACPI: power: Use strscpy() instead of strcpy()
  ACPI: pci_root: Use strscpy() instead of strcpy()
  ACPI: pci_link: Use strscpy() instead of strcpy()
  ACPI: event: Use strscpy() instead of strcpy()
  ACPI: EC: Use strscpy() instead of strcpy()
  ACPI: APD: Use strscpy() instead of strcpy()
  ACPI: thermal: Use strscpy() instead of strcpy()
This commit is contained in:
Rafael J. Wysocki 2024-11-15 20:52:02 +01:00
commit d47a60e487
22 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/ac.c
View File

@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev)
static struct platform_driver acpi_ac_driver = { static struct platform_driver acpi_ac_driver = {
.probe = acpi_ac_probe, .probe = acpi_ac_probe,
.remove_new = acpi_ac_remove, .remove = acpi_ac_remove,
.driver = { .driver = {
.name = "ac", .name = "ac",
.acpi_match_table = ac_device_ids, .acpi_match_table = ac_device_ids,

2
drivers/acpi/acpi_apd.c
View File

@ -86,7 +86,7 @@ static int fch_misc_setup(struct apd_private_data *pdata)
if (!clk_data->name) if (!clk_data->name)
return -ENOMEM; return -ENOMEM;
strcpy(clk_data->name, obj->string.pointer); strscpy(clk_data->name, obj->string.pointer, obj->string.length);
} else { } else {
/* Set default name to mclk if entry missing in firmware */ /* Set default name to mclk if entry missing in firmware */
clk_data->name = "mclk"; clk_data->name = "mclk";

2
drivers/acpi/acpi_pad.c
View File

@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids);
static struct platform_driver acpi_pad_driver = { static struct platform_driver acpi_pad_driver = {
.probe = acpi_pad_probe, .probe = acpi_pad_probe,
.remove_new = acpi_pad_remove, .remove = acpi_pad_remove,
.driver = { .driver = {
.dev_groups = acpi_pad_groups, .dev_groups = acpi_pad_groups,
.name = "processor_aggregator", .name = "processor_aggregator",

2
drivers/acpi/acpi_tad.c
View File

@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = {
.acpi_match_table = acpi_tad_ids, .acpi_match_table = acpi_tad_ids,
}, },
.probe = acpi_tad_probe, .probe = acpi_tad_probe,
.remove_new = acpi_tad_remove, .remove = acpi_tad_remove,
}; };
MODULE_DEVICE_TABLE(acpi, acpi_tad_ids); MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);

2
drivers/acpi/apei/einj-core.c
View File

@ -880,7 +880,7 @@ static struct platform_device *einj_dev;
* triggering a section mismatch warning. * triggering a section mismatch warning.
*/ */
static struct platform_driver einj_driver __refdata = { static struct platform_driver einj_driver __refdata = {
.remove_new = __exit_p(einj_remove), .remove = __exit_p(einj_remove),
.driver = { .driver = {
.name = "acpi-einj", .name = "acpi-einj",
}, },

2
drivers/acpi/apei/ghes.c
View File

@ -1605,7 +1605,7 @@ static struct platform_driver ghes_platform_driver = {
.name = "GHES", .name = "GHES",
}, },
.probe = ghes_probe, .probe = ghes_probe,
.remove_new = ghes_remove, .remove = ghes_remove,
}; };
void __init acpi_ghes_init(void) void __init acpi_ghes_init(void)

2
drivers/acpi/arm64/agdi.c
View File

@ -88,7 +88,7 @@ static struct platform_driver agdi_driver = {
.name = "agdi", .name = "agdi",
}, },
.probe = agdi_probe, .probe = agdi_probe,
.remove_new = agdi_remove, .remove = agdi_remove,
}; };
void __init acpi_agdi_init(void) void __init acpi_agdi_init(void)

2
drivers/acpi/dptf/dptf_pch_fivr.c
View File

@ -158,7 +158,7 @@ MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
static struct platform_driver pch_fivr_driver = { static struct platform_driver pch_fivr_driver = {
.probe = pch_fivr_add, .probe = pch_fivr_add,
.remove_new = pch_fivr_remove, .remove = pch_fivr_remove,
.driver = { .driver = {
.name = "dptf_pch_fivr", .name = "dptf_pch_fivr",
.acpi_match_table = pch_fivr_device_ids, .acpi_match_table = pch_fivr_device_ids,

2
drivers/acpi/dptf/dptf_power.c
View File

@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
static struct platform_driver dptf_power_driver = { static struct platform_driver dptf_power_driver = {
.probe = dptf_power_add, .probe = dptf_power_add,
.remove_new = dptf_power_remove, .remove = dptf_power_remove,
.driver = { .driver = {
.name = "dptf_power", .name = "dptf_power",
.acpi_match_table = int3407_device_ids, .acpi_match_table = int3407_device_ids,

4
drivers/acpi/ec.c
View File

@ -1677,8 +1677,8 @@ static int acpi_ec_add(struct acpi_device *device)
struct acpi_ec *ec; struct acpi_ec *ec;
int ret; int ret;
strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_EC_CLASS); strscpy(acpi_device_class(device), ACPI_EC_CLASS);
if (boot_ec && (boot_ec->handle == device->handle || if (boot_ec && (boot_ec->handle == device->handle ||
!strcmp(acpi_device_hid(device), ACPI_ECDT_HID))) { !strcmp(acpi_device_hid(device), ACPI_ECDT_HID))) {

4
drivers/acpi/event.c
View File

@ -28,8 +28,8 @@ int acpi_notifier_call_chain(struct acpi_device *dev, u32 type, u32 data)
{ {
struct acpi_bus_event event; struct acpi_bus_event event;
strcpy(event.device_class, dev->pnp.device_class); strscpy(event.device_class, dev->pnp.device_class);
strcpy(event.bus_id, dev->pnp.bus_id); strscpy(event.bus_id, dev->pnp.bus_id);
event.type = type; event.type = type;
event.data = data; event.data = data;
return (blocking_notifier_call_chain(&acpi_chain_head, 0, (void *)&event) return (blocking_notifier_call_chain(&acpi_chain_head, 0, (void *)&event)

2
drivers/acpi/evged.c
View File

@ -185,7 +185,7 @@ static const struct acpi_device_id ged_acpi_ids[] = {
static struct platform_driver ged_driver = { static struct platform_driver ged_driver = {
.probe = ged_probe, .probe = ged_probe,
.remove_new = ged_remove, .remove = ged_remove,
.shutdown = ged_shutdown, .shutdown = ged_shutdown,
.driver = { .driver = {
.name = MODULE_NAME, .name = MODULE_NAME,

2
drivers/acpi/fan_core.c
View File

@ -448,7 +448,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
static struct platform_driver acpi_fan_driver = { static struct platform_driver acpi_fan_driver = {
.probe = acpi_fan_probe, .probe = acpi_fan_probe,
.remove_new = acpi_fan_remove, .remove = acpi_fan_remove,
.driver = { .driver = {
.name = "acpi-fan", .name = "acpi-fan",
.acpi_match_table = fan_device_ids, .acpi_match_table = fan_device_ids,

4
drivers/acpi/pci_link.c
View File

@ -714,8 +714,8 @@ static int acpi_pci_link_add(struct acpi_device *device,
return -ENOMEM; return -ENOMEM;
link->device = device; link->device = device;
strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); strscpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS);
device->driver_data = link; device->driver_data = link;
mutex_lock(&acpi_link_lock); mutex_lock(&acpi_link_lock);

4
drivers/acpi/pci_root.c
View File

@ -689,8 +689,8 @@ static int acpi_pci_root_add(struct acpi_device *device,
root->device = device; root->device = device;
root->segment = segment & 0xFFFF; root->segment = segment & 0xFFFF;
strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); strscpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
device->driver_data = root; device->driver_data = root;
if (hotadd && dmar_device_add(handle)) { if (hotadd && dmar_device_add(handle)) {

2
drivers/acpi/pfr_telemetry.c
View File

@ -422,7 +422,7 @@ static struct platform_driver acpi_pfrt_log_driver = {
.acpi_match_table = acpi_pfrt_log_ids, .acpi_match_table = acpi_pfrt_log_ids,
}, },
.probe = acpi_pfrt_log_probe, .probe = acpi_pfrt_log_probe,
.remove_new = acpi_pfrt_log_remove, .remove = acpi_pfrt_log_remove,
}; };
module_platform_driver(acpi_pfrt_log_driver); module_platform_driver(acpi_pfrt_log_driver);

2
drivers/acpi/pfr_update.c
View File

@ -565,7 +565,7 @@ static struct platform_driver acpi_pfru_driver = {
.acpi_match_table = acpi_pfru_ids, .acpi_match_table = acpi_pfru_ids,
}, },
.probe = acpi_pfru_probe, .probe = acpi_pfru_probe,
.remove_new = acpi_pfru_remove, .remove = acpi_pfru_remove,
}; };
module_platform_driver(acpi_pfru_driver); module_platform_driver(acpi_pfru_driver);

4
drivers/acpi/power.c
View File

@ -950,8 +950,8 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)
mutex_init(&resource->resource_lock); mutex_init(&resource->resource_lock);
INIT_LIST_HEAD(&resource->list_node); INIT_LIST_HEAD(&resource->list_node);
INIT_LIST_HEAD(&resource->dependents); INIT_LIST_HEAD(&resource->dependents);
strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_POWER_CLASS); strscpy(acpi_device_class(device), ACPI_POWER_CLASS);
device->power.state = ACPI_STATE_UNKNOWN; device->power.state = ACPI_STATE_UNKNOWN;
device->flags.match_driver = true; device->flags.match_driver = true;

4
drivers/acpi/sbs.c
View File

@ -644,8 +644,8 @@ static int acpi_sbs_add(struct acpi_device *device)
sbs->hc = acpi_driver_data(acpi_dev_parent(device)); sbs->hc = acpi_driver_data(acpi_dev_parent(device));
sbs->device = device; sbs->device = device;
strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_SBS_CLASS); strscpy(acpi_device_class(device), ACPI_SBS_CLASS);
device->driver_data = sbs; device->driver_data = sbs;
result = acpi_charger_add(sbs); result = acpi_charger_add(sbs);

4
drivers/acpi/sbshc.c
View File

@ -252,8 +252,8 @@ static int acpi_smbus_hc_add(struct acpi_device *device)
return -EIO; return -EIO;
} }
strcpy(acpi_device_name(device), ACPI_SMB_HC_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_SMB_HC_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_SMB_HC_CLASS); strscpy(acpi_device_class(device), ACPI_SMB_HC_CLASS);
hc = kzalloc(sizeof(struct acpi_smb_hc), GFP_KERNEL); hc = kzalloc(sizeof(struct acpi_smb_hc), GFP_KERNEL);
if (!hc) if (!hc)

14
drivers/acpi/scan.c
View File

@ -1179,19 +1179,19 @@ static void acpi_device_get_busid(struct acpi_device *device)
* TBD: Shouldn't this value be unique (within the ACPI namespace)? * TBD: Shouldn't this value be unique (within the ACPI namespace)?
*/ */
if (!acpi_dev_parent(device)) { if (!acpi_dev_parent(device)) {
strcpy(device->pnp.bus_id, "ACPI"); strscpy(device->pnp.bus_id, "ACPI");
return; return;
} }
switch (device->device_type) { switch (device->device_type) {
case ACPI_BUS_TYPE_POWER_BUTTON: case ACPI_BUS_TYPE_POWER_BUTTON:
strcpy(device->pnp.bus_id, "PWRF"); strscpy(device->pnp.bus_id, "PWRF");
break; break;
case ACPI_BUS_TYPE_SLEEP_BUTTON: case ACPI_BUS_TYPE_SLEEP_BUTTON:
strcpy(device->pnp.bus_id, "SLPF"); strscpy(device->pnp.bus_id, "SLPF");
break; break;
case ACPI_BUS_TYPE_ECDT_EC: case ACPI_BUS_TYPE_ECDT_EC:
strcpy(device->pnp.bus_id, "ECDT"); strscpy(device->pnp.bus_id, "ECDT");
break; break;
default: default:
acpi_get_name(device->handle, ACPI_SINGLE_NAME, &buffer); acpi_get_name(device->handle, ACPI_SINGLE_NAME, &buffer);
@ -1202,7 +1202,7 @@ static void acpi_device_get_busid(struct acpi_device *device)
else else
break; break;
} }
strcpy(device->pnp.bus_id, bus_id); strscpy(device->pnp.bus_id, bus_id);
break; break;
} }
} }
@ -1453,8 +1453,8 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
acpi_object_is_system_bus(handle)) { acpi_object_is_system_bus(handle)) {
/* \_SB, \_TZ, LNXSYBUS */ /* \_SB, \_TZ, LNXSYBUS */
acpi_add_id(pnp, ACPI_BUS_HID); acpi_add_id(pnp, ACPI_BUS_HID);
strcpy(pnp->device_name, ACPI_BUS_DEVICE_NAME); strscpy(pnp->device_name, ACPI_BUS_DEVICE_NAME);
strcpy(pnp->device_class, ACPI_BUS_CLASS); strscpy(pnp->device_class, ACPI_BUS_CLASS);
} }
break; break;

6
drivers/acpi/thermal.c
View File

@ -796,9 +796,9 @@ static int acpi_thermal_add(struct acpi_device *device)
return -ENOMEM; return -ENOMEM;
tz->device = device; tz->device = device;
strcpy(tz->name, device->pnp.bus_id); strscpy(tz->name, device->pnp.bus_id);
strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME); strscpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS); strscpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
device->driver_data = tz; device->driver_data = tz;
acpi_thermal_aml_dependency_fix(tz); acpi_thermal_aml_dependency_fix(tz);