diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2024-10-15 22:55:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-16 10:55:57 +0300 |
| commit | 4dfcc5fd0f9b19c0df9f0499861baf56ec2ba4cb (patch) | |
| tree | 05584871b1d4be805d6ba0ca0b6c78e0c1feaf17 | |
| parent | b0a7dfeb7df670bb8603e043c9634aa9eda42a49 (diff) | |
| download | linux-4dfcc5fd0f9b19c0df9f0499861baf56ec2ba4cb.tar.xz | |
staging: gpib: Fix PCI header include guard
Clang warns (or errors with CONFIG_WERROR=y):
In file included from drivers/staging/gpib/ines/ines_gpib.c:19:
drivers/staging/gpib/include/gpib_pci_ids.h:3:9: error: '__GPIB_PCI_IDS_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard]
3 | #ifndef __GPIB_PCI_IDS_H
| ^~~~~~~~~~~~~~~~
drivers/staging/gpib/include/gpib_pci_ids.h:4:9: note: '__GPIB_LINUX_PCI_IDS_H' is defined here; did you mean '__GPIB_PCI_IDS_H'?
4 | #define __GPIB_LINUX_PCI_IDS_H
| ^~~~~~~~~~~~~~~~~~~~~~
| __GPIB_PCI_IDS_H
Fix the define to match the guard like the note suggests, as that is
clearly what was intended here.
Fixes: 6c52d5e3cde2 ("staging: gpib: Add common include files for GPIB drivers")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20241015-staging-gpib-fix-pci-header-guard-v1-1-dfa45fe8d63f@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/gpib/include/gpib_pci_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gpib/include/gpib_pci_ids.h b/drivers/staging/gpib/include/gpib_pci_ids.h index 162b02deb0ad..52dcab07a7d1 100644 --- a/drivers/staging/gpib/include/gpib_pci_ids.h +++ b/drivers/staging/gpib/include/gpib_pci_ids.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef __GPIB_PCI_IDS_H -#define __GPIB_LINUX_PCI_IDS_H +#define __GPIB_PCI_IDS_H #ifndef PCI_VENDOR_ID_AMCC #define PCI_VENDOR_ID_AMCC 0x10e8 |