Commit d47a60e4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 563c87f5 927df4ca

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev) 


static struct platform_driver acpi_ac_driver = {

	.probe = acpi_ac_probe,

	.remove_new = acpi_ac_remove,

	.remove = acpi_ac_remove,

	.driver = {

		.name = "ac",

		.acpi_match_table = ac_device_ids,

drivers/acpi/acpi_apd.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int fch_misc_setup(struct apd_private_data *pdata) 
		if (!clk_data->name)

			return -ENOMEM;



		strcpy(clk_data->name, obj->string.pointer);

		strscpy(clk_data->name, obj->string.pointer, obj->string.length);

	} else {

		/* Set default name to mclk if entry missing in firmware */

		clk_data->name = "mclk";

drivers/acpi/acpi_pad.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids); 


static struct platform_driver acpi_pad_driver = {

	.probe = acpi_pad_probe,

	.remove_new = acpi_pad_remove,

	.remove = acpi_pad_remove,

	.driver = {

		.dev_groups = acpi_pad_groups,

		.name = "processor_aggregator",

drivers/acpi/acpi_tad.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = { 
		.acpi_match_table = acpi_tad_ids,

	},

	.probe = acpi_tad_probe,

	.remove_new = acpi_tad_remove,

	.remove = acpi_tad_remove,

};

MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);

drivers/acpi/apei/einj-core.c

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static struct platform_device *einj_dev; 
 * triggering a section mismatch warning.

 */

static struct platform_driver einj_driver __refdata = {

	.remove_new = __exit_p(einj_remove),

	.remove = __exit_p(einj_remove),

	.driver = {

		.name = "acpi-einj",

	},