| Message ID | 20230516201415.556858-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/3] acpi: nfit: add declaration in a local header | expand |
On 5/16/23 1:14 PM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The nfit_intel_shutdown_status() function has a __weak defintion > in nfit.c and an override in acpi_nfit_test.c for testing > purposes. This works without an extern declaration, but causes > a W=1 build warning: > > drivers/acpi/nfit/core.c:1717:13: error: no previous prototype for 'nfit_intel_shutdown_status' [-Werror=missing-prototypes] > > Add a declaration in a header that gets included from both > sides to shut up the warning and ensure that the prototypes > actually match. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/acpi/nfit/nfit.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h > index 6023ad61831a..573bc0de2990 100644 > --- a/drivers/acpi/nfit/nfit.h > +++ b/drivers/acpi/nfit/nfit.h > @@ -347,4 +347,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, > void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev); > bool intel_fwa_supported(struct nvdimm_bus *nvdimm_bus); > extern struct device_attribute dev_attr_firmware_activate_noidle; > +void nfit_intel_shutdown_status(struct nfit_mem *nfit_mem); > + > #endif /* __NFIT_H__ */
On Mon, May 22, 2023 at 5:22 PM Dave Jiang <dave.jiang@intel.com> wrote: > > > > On 5/16/23 1:14 PM, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > The nfit_intel_shutdown_status() function has a __weak defintion > > in nfit.c and an override in acpi_nfit_test.c for testing > > purposes. This works without an extern declaration, but causes > > a W=1 build warning: > > > > drivers/acpi/nfit/core.c:1717:13: error: no previous prototype for 'nfit_intel_shutdown_status' [-Werror=missing-prototypes] > > > > Add a declaration in a header that gets included from both > > sides to shut up the warning and ensure that the prototypes > > actually match. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Reviewed-by: Dave Jiang <dave.jiang@intel.com> Applied as 6.5 material, thanks! > > --- > > drivers/acpi/nfit/nfit.h | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h > > index 6023ad61831a..573bc0de2990 100644 > > --- a/drivers/acpi/nfit/nfit.h > > +++ b/drivers/acpi/nfit/nfit.h > > @@ -347,4 +347,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, > > void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev); > > bool intel_fwa_supported(struct nvdimm_bus *nvdimm_bus); > > extern struct device_attribute dev_attr_firmware_activate_noidle; > > +void nfit_intel_shutdown_status(struct nfit_mem *nfit_mem); > > + > > #endif /* __NFIT_H__ */
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h index 6023ad61831a..573bc0de2990 100644 --- a/drivers/acpi/nfit/nfit.h +++ b/drivers/acpi/nfit/nfit.h @@ -347,4 +347,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev); bool intel_fwa_supported(struct nvdimm_bus *nvdimm_bus); extern struct device_attribute dev_attr_firmware_activate_noidle; +void nfit_intel_shutdown_status(struct nfit_mem *nfit_mem); + #endif /* __NFIT_H__ */