Skip to content

Commit d47a60e

Browse files
committed
Merge branch 'acpi-misc'
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()
2 parents 563c87f + 927df4c commit d47a60e

22 files changed

+37
-37
lines changed

drivers/acpi/ac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev)
290290

291291
static struct platform_driver acpi_ac_driver = {
292292
.probe = acpi_ac_probe,
293-
.remove_new = acpi_ac_remove,
293+
.remove = acpi_ac_remove,
294294
.driver = {
295295
.name = "ac",
296296
.acpi_match_table = ac_device_ids,

drivers/acpi/acpi_apd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int fch_misc_setup(struct apd_private_data *pdata)
8686
if (!clk_data->name)
8787
return -ENOMEM;
8888

89-
strcpy(clk_data->name, obj->string.pointer);
89+
strscpy(clk_data->name, obj->string.pointer, obj->string.length);
9090
} else {
9191
/* Set default name to mclk if entry missing in firmware */
9292
clk_data->name = "mclk";

drivers/acpi/acpi_pad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids);
462462

463463
static struct platform_driver acpi_pad_driver = {
464464
.probe = acpi_pad_probe,
465-
.remove_new = acpi_pad_remove,
465+
.remove = acpi_pad_remove,
466466
.driver = {
467467
.dev_groups = acpi_pad_groups,
468468
.name = "processor_aggregator",

drivers/acpi/acpi_tad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = {
684684
.acpi_match_table = acpi_tad_ids,
685685
},
686686
.probe = acpi_tad_probe,
687-
.remove_new = acpi_tad_remove,
687+
.remove = acpi_tad_remove,
688688
};
689689
MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);
690690

drivers/acpi/apei/einj-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ static struct platform_device *einj_dev;
880880
* triggering a section mismatch warning.
881881
*/
882882
static struct platform_driver einj_driver __refdata = {
883-
.remove_new = __exit_p(einj_remove),
883+
.remove = __exit_p(einj_remove),
884884
.driver = {
885885
.name = "acpi-einj",
886886
},

drivers/acpi/apei/ghes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ static struct platform_driver ghes_platform_driver = {
16051605
.name = "GHES",
16061606
},
16071607
.probe = ghes_probe,
1608-
.remove_new = ghes_remove,
1608+
.remove = ghes_remove,
16091609
};
16101610

16111611
void __init acpi_ghes_init(void)

drivers/acpi/arm64/agdi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static struct platform_driver agdi_driver = {
8888
.name = "agdi",
8989
},
9090
.probe = agdi_probe,
91-
.remove_new = agdi_remove,
91+
.remove = agdi_remove,
9292
};
9393

9494
void __init acpi_agdi_init(void)

drivers/acpi/dptf/dptf_pch_fivr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
158158

159159
static struct platform_driver pch_fivr_driver = {
160160
.probe = pch_fivr_add,
161-
.remove_new = pch_fivr_remove,
161+
.remove = pch_fivr_remove,
162162
.driver = {
163163
.name = "dptf_pch_fivr",
164164
.acpi_match_table = pch_fivr_device_ids,

drivers/acpi/dptf/dptf_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
242242

243243
static struct platform_driver dptf_power_driver = {
244244
.probe = dptf_power_add,
245-
.remove_new = dptf_power_remove,
245+
.remove = dptf_power_remove,
246246
.driver = {
247247
.name = "dptf_power",
248248
.acpi_match_table = int3407_device_ids,

drivers/acpi/ec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,8 +1677,8 @@ static int acpi_ec_add(struct acpi_device *device)
16771677
struct acpi_ec *ec;
16781678
int ret;
16791679

1680-
strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
1681-
strcpy(acpi_device_class(device), ACPI_EC_CLASS);
1680+
strscpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
1681+
strscpy(acpi_device_class(device), ACPI_EC_CLASS);
16821682

16831683
if (boot_ec && (boot_ec->handle == device->handle ||
16841684
!strcmp(acpi_device_hid(device), ACPI_ECDT_HID))) {

0 commit comments

Comments
 (0)