| Message ID | 20240307111216.45053-1-rf@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27219a5b3285dffb6e2e1b915a0ccdbf07f9a3a0 |
| Headers | show |
| Series | [1/2] ALSA: hda: hda_component: Add missing #include guards | expand |
On Thu, 07 Mar 2024 12:12:15 +0100, Richard Fitzgerald wrote: > > Add the conventional include guards around the content of the > hda_component.h header file. This prevents double-declaration of > struct hda_component if the header gets included multiple times. > > This isn't causing any problems with current code, so no need to > backport to older kernels. > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Applied both patches now. Thanks. Takashi
diff --git a/sound/pci/hda/hda_component.h b/sound/pci/hda/hda_component.h index deae9dea01b4..a0fcc723483d 100644 --- a/sound/pci/hda/hda_component.h +++ b/sound/pci/hda/hda_component.h @@ -6,6 +6,9 @@ * Cirrus Logic International Semiconductor Ltd. */ +#ifndef __HDA_COMPONENT_H__ +#define __HDA_COMPONENT_H__ + #include <linux/acpi.h> #include <linux/component.h> @@ -82,3 +85,5 @@ static inline void hda_component_manager_unbind(struct hda_codec *cdc, { component_unbind_all(hda_codec_dev(cdc), comps); } + +#endif /* ifndef __HDA_COMPONENT_H__ */
Add the conventional include guards around the content of the hda_component.h header file. This prevents double-declaration of struct hda_component if the header gets included multiple times. This isn't causing any problems with current code, so no need to backport to older kernels. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> --- sound/pci/hda/hda_component.h | 5 +++++ 1 file changed, 5 insertions(+)