Skip to contentSkip to conversation

nvmem: bcm-ocotp: mark ACPI device ID table as maybe unused

PATCH Applied Krzysztof Kozlowski 2 participants 4 messages Mar 21, 2022 – Apr 29, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 nvmem: bcm-ocotp: mark ACPI device ID table as maybe unused

"bcm_otpc_acpi_ids" is used with ACPI_PTR, so a build with !CONFIG_ACPI has a warning:

drivers/nvmem/bcm-ocotp.c:247:36: error:
‘bcm_otpc_acpi_ids’ defined but not used [-Werror=unused-const-variable=]

---
 drivers/nvmem/bcm-ocotp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/bcm-ocotp.c +1 -1
index a8097511582a..dfea96c52463 100644
@@ -244,7 +244,7 @@ static const struct of_device_id bcm_otpc_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, bcm_otpc_dt_ids);
 
-static const struct acpi_device_id bcm_otpc_acpi_ids[] = {
+static const struct acpi_device_id bcm_otpc_acpi_ids[] __maybe_unused = {
 	{ .id = "BRCM0700", .driver_data = (kernel_ulong_t)&otp_map },
 	{ .id = "BRCM0701", .driver_data = (kernel_ulong_t)&otp_map_v2 },
 	{ /* sentinel */ }
Signature · 1 line
2.32.0
#1 lore raw

PATCH 2/3 nvmem: sunplus-ocotp: staticize sp_otp_v0

The "sp_otp_v0" file scope variable is not used outside, so make it static to fix warning:

drivers/nvmem/sunplus-ocotp.c:74:29: sparse:
sparse: symbol 'sp_otp_v0' was not declared. Should it be static?

---
 drivers/nvmem/sunplus-ocotp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/sunplus-ocotp.c +1 -1
index 2dc59c22eb55..c94134649714 100644
@@ -71,7 +71,7 @@ struct sp_ocotp_data {
 	int size;
 };
 
-const struct sp_ocotp_data  sp_otp_v0 = {
+static const struct sp_ocotp_data sp_otp_v0 = {
 	.size = QAC628_OTP_SIZE,
 };
 
Signature · 1 line
2.32.0
#2 lore raw

PATCH 3/3 nvmem: sunplus-ocotp: drop useless probe confirmation

In reply to Krzysztof Kozlowski

Printing probe success is discouraged, because we can use tracing for this purpose. Remove useless print message after Sunplus OCOTP driver probe.

---
 drivers/nvmem/sunplus-ocotp.c | 2 --
 1 file changed, 2 deletions(-)
drivers/nvmem/sunplus-ocotp.c +0 -2
index c94134649714..52b928a7a6d5 100644
@@ -202,8 +202,6 @@ static int sp_ocotp_probe(struct platform_device *pdev)
 		(int)QAC628_OTP_NUM_BANKS, (int)OTP_WORDS_PER_BANK,
 		(int)OTP_WORD_SIZE, (int)QAC628_OTP_SIZE);
 
-	dev_info(dev, "by Sunplus (C) 2020");
-
 	return 0;
 }
 
Signature · 1 line
2.32.0
#3 lore raw
In reply to Krzysztof Kozlowski
Quoted 7 lines · Krzysztof Kozlowski

"bcm_otpc_acpi_ids" is used with ACPI_PTR, so a build with !CONFIG_ACPI has a warning:

drivers/nvmem/bcm-ocotp.c:247:36: error:
‘bcm_otpc_acpi_ids’ defined but not used [-Werror=unused-const-variable=]

Applied all thanks,
--srini

Quoted 17 lines
---
  drivers/nvmem/bcm-ocotp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/bcm-ocotp.c +1 -1
index a8097511582a..dfea96c52463 100644
@@ -244,7 +244,7 @@ static const struct of_device_id bcm_otpc_dt_ids[] = {
  };
  MODULE_DEVICE_TABLE(of, bcm_otpc_dt_ids);
 
-static const struct acpi_device_id bcm_otpc_acpi_ids[] = {
+static const struct acpi_device_id bcm_otpc_acpi_ids[] __maybe_unused = {
  	{ .id = "BRCM0700", .driver_data = (kernel_ulong_t)&otp_map },
  	{ .id = "BRCM0701", .driver_data = (kernel_ulong_t)&otp_map_v2 },
  	{ /* sentinel */ }