| Message ID | 20181220193856.7833-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | ACPI / tables: Add an ifdef around amlcode and dsdt_amlcode | expand |
On Thu, Dec 20, 2018 at 12:38:56PM -0700, Nathan Chancellor wrote: > Clang warns: > > drivers/acpi/tables.c:715:14: warning: unused variable 'amlcode' > [-Wunused-variable] > static void *amlcode __attribute__ ((weakref("AmlCode"))); > ^ > drivers/acpi/tables.c:716:14: warning: unused variable 'dsdt_amlcode' > [-Wunused-variable] > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > ^ > 2 warnings generated. > > The only uses of these variables are hiddem behind CONFIG_ACPI_CUSTOM_DSDT > so do the same thing here. > > Fixes: 82e4eb4e9653 ("ACPI / tables: add DSDT AmlCode new declaration name support") > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/acpi/tables.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index ccb90eff00e5..48eabb6c2d4f 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -712,8 +712,10 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, > table_length); > } > > +#ifdef CONFIG_ACPI_CUSTOM_DSDT > static void *amlcode __attribute__ ((weakref("AmlCode"))); > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > +#endif > > acpi_status > acpi_os_table_override(struct acpi_table_header *existing_table, > -- > 2.20.1 > + Nick for review
On Thursday, December 20, 2018 8:38:56 PM CET Nathan Chancellor wrote: > Clang warns: > > drivers/acpi/tables.c:715:14: warning: unused variable 'amlcode' > [-Wunused-variable] > static void *amlcode __attribute__ ((weakref("AmlCode"))); > ^ > drivers/acpi/tables.c:716:14: warning: unused variable 'dsdt_amlcode' > [-Wunused-variable] > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > ^ > 2 warnings generated. > > The only uses of these variables are hiddem behind CONFIG_ACPI_CUSTOM_DSDT > so do the same thing here. > > Fixes: 82e4eb4e9653 ("ACPI / tables: add DSDT AmlCode new declaration name support") > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/acpi/tables.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index ccb90eff00e5..48eabb6c2d4f 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -712,8 +712,10 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, > table_length); > } > > +#ifdef CONFIG_ACPI_CUSTOM_DSDT > static void *amlcode __attribute__ ((weakref("AmlCode"))); > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > +#endif > > acpi_status > acpi_os_table_override(struct acpi_table_header *existing_table, > Applied, thanks!
On Thu, Dec 20, 2018 at 1:57 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > On Thu, Dec 20, 2018 at 12:38:56PM -0700, Nathan Chancellor wrote: > > Clang warns: > > > > drivers/acpi/tables.c:715:14: warning: unused variable 'amlcode' > > [-Wunused-variable] > > static void *amlcode __attribute__ ((weakref("AmlCode"))); > > ^ > > drivers/acpi/tables.c:716:14: warning: unused variable 'dsdt_amlcode' > > [-Wunused-variable] > > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > > ^ > > 2 warnings generated. > > > > The only uses of these variables are hiddem behind CONFIG_ACPI_CUSTOM_DSDT > > so do the same thing here. > > > > Fixes: 82e4eb4e9653 ("ACPI / tables: add DSDT AmlCode new declaration name support") > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > > --- > > drivers/acpi/tables.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > > index ccb90eff00e5..48eabb6c2d4f 100644 > > --- a/drivers/acpi/tables.c > > +++ b/drivers/acpi/tables.c > > @@ -712,8 +712,10 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, > > table_length); > > } > > > > +#ifdef CONFIG_ACPI_CUSTOM_DSDT > > static void *amlcode __attribute__ ((weakref("AmlCode"))); > > static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); > > +#endif Thanks for this patch Nathan. I'm curious if rather than adding a second set of preprocessor guards, we could simply move the declaration of these 2 variables closer to their use, putting them in the existing preprocessor guards from 82e4eb4e9653?
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index ccb90eff00e5..48eabb6c2d4f 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -712,8 +712,10 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, table_length); } +#ifdef CONFIG_ACPI_CUSTOM_DSDT static void *amlcode __attribute__ ((weakref("AmlCode"))); static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); +#endif acpi_status acpi_os_table_override(struct acpi_table_header *existing_table,
Clang warns: drivers/acpi/tables.c:715:14: warning: unused variable 'amlcode' [-Wunused-variable] static void *amlcode __attribute__ ((weakref("AmlCode"))); ^ drivers/acpi/tables.c:716:14: warning: unused variable 'dsdt_amlcode' [-Wunused-variable] static void *dsdt_amlcode __attribute__ ((weakref("dsdt_aml_code"))); ^ 2 warnings generated. The only uses of these variables are hiddem behind CONFIG_ACPI_CUSTOM_DSDT so do the same thing here. Fixes: 82e4eb4e9653 ("ACPI / tables: add DSDT AmlCode new declaration name support") Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/acpi/tables.c | 2 ++ 1 file changed, 2 insertions(+)